summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
AgeCommit message (Expand)AuthorFilesLines
2017-03-15Merge pull request #1155 from deadcyclo/masterJack Humbert7-20/+73
2017-03-15update for infinityJack Humbert1-1/+1
2017-03-11[deadcyclo layout] fix an error in layer illustrationBrendan Johan Lee1-0/+0
2017-03-11[deadcyclo layout] Added second unicode layer, more sane layer switchesBrendan Johan Lee7-20/+73
2017-03-11remove typo from folder nameDennis Trümper2-0/+0
2017-03-11update documentationDennis Trümper2-79/+86
2017-03-11change layer 3 on right thumb back to layer 1Dennis Trümper1-2/+2
2017-03-11working but some documentation neededDennis Trümper2-0/+595
2017-03-09Tweaks keymap to reset on bootErez Zukerman1-1/+1
2017-03-09Merge pull request #1137 from Skrymir/patch-1Jack Humbert1-1/+1
2017-03-09Merge pull request #1142 from guni77/my_keymapJack Humbert2-0/+310
2017-03-08readmeLukas Stiebig1-0/+12
2017-03-08Corrected the description of the layerLukas Stiebig1-1/+2
2017-03-08Added german-lukasLukas Stiebig1-0/+235
2017-03-08added readme fileGunther Gruber1-0/+133
2017-03-07Fixed minor error in ergodox infinity section.Joshua Colbeck1-1/+1
2017-02-28Merge pull request #1121 from Leszek111/masterJack Humbert5-0/+280
2017-02-27small changes in guni.c keymap to work with new qmk_firmware packetGunther Gruber1-0/+177
2017-02-27Ammend readme.md1-2/+4
2017-02-27Add colemak_programmer5-0/+278
2017-02-22Merge pull request #1113 from kesslern/masterJack Humbert2-0/+240
2017-02-22Merge remote-tracking branch 'qmk/master'Josh Colbeck336-0/+40740
2017-02-21Add dvorak_emacs_software layout for ergodoxNathan Kessler2-0/+240
2017-02-16remove more warningsJack Humbert2-0/+3
2017-02-16Merge pull request #1105 from nrrkeene/masterJack Humbert8-80/+165
2017-02-16The Ordinary Layout has all the keys in the right places.Nicholas Keene1-1/+1
2017-02-16This is the best layout, really, come lookNicholas Keene1-4/+4
2017-02-16The Ordinary Layout is the best one, the one you are looking for. Really. Che...Nicholas Keene4-29/+43
2017-02-15The Ordinary Layout is boring, normal, typical, expected.Nicholas Keene2-54/+125
2017-02-15The Ordinary Layout has a feature for one-handed chorded typingNicholas Keene2-3/+3
2017-02-15All my friends us The Ordinary Layout because it doesn't force you to change ...Nicholas Keene2-4/+4
2017-02-15The Ordinary Layout now has more symbols on the Symbols layer! So useful!Nicholas Keene2-11/+11
2017-02-13updated readmeluc wastiaux1-1/+1
2017-02-13Merge remote-tracking branch 'upstream/master'luc wastiaux22-146/+1298
2017-02-13change thumb cluster key to be shiftluc wastiaux1-2/+2
2017-02-10made left shift an MO for SHELL_NAVluc wastiaux3-45/+9
2017-02-09[Typo] correct link to default keymap in readme.Rob Rogers1-1/+1
2017-02-04Add missing header to ergodox ordinary keymapNikolaus Wittenstein1-0/+1
2017-02-04Fix compile warnings in egodox robot_test_layoutNikolaus Wittenstein1-4/+4
2017-02-01Merge remote-tracking branch 'upstream/master'Brendan Johan Lee5-30/+900
2017-02-01increase timeout for dual mode caps keylucwastiaux1-1/+1
2017-02-01Merge pull request #1039 from zabereer/albert_ergodox_keymapErez Zukerman4-0/+866
2017-01-30update my neo2 keymapMatthias Schmitt1-30/+34
2017-01-30[deadcyclo layout] Refactoring. Use custom functions and macrosBrendan Johan Lee1-237/+266
2017-01-30[deadcyclo layout] fixed failing testsBrendan Johan Lee1-16/+1
2017-01-28eliminate references to shell_layerlucwastiaux1-1/+1
2017-01-28documented dual mode capslocklucwastiaux2-27/+3
2017-01-27dual capslock functionality, activating shell nav or bracketslucwastiaux1-3/+20
2017-01-27Merge remote-tracking branch 'upstream/master'Brendan Johan Lee8-9/+9
2017-01-27[deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keysBrendan Johan Lee4-23/+26