summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox/keymaps
AgeCommit message (Expand)AuthorFilesLines
2016-08-20Rename file following upstream folder rename.Olivier1-0/+9
2016-08-20Merge https://github.com/jackhumbert/qmk_firmwareOlivier189-0/+23709
2016-08-20Merge pull request #665 from linsomniac/keymap_jafoJack Humbert5-0/+213
2016-08-20Merge pull request #658 from Xyverz/masterJack Humbert2-209/+211
2016-08-20Merge pull request #630 from nrrkeene/masterJack Humbert10-275/+237
2016-08-20Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md.Xyverz2-17/+10
2016-08-20Changed my keymap to match normal keymaps.Xyverz1-314/+198
2016-08-20The Ordinary Layout is boring because all the keys are where you expect them ...Nicholas Keene1-1/+1
2016-08-20The Ordinary Layout is boring because all the keys are where you expect them ...Nicholas Keene8-111/+98
2016-08-20Bringing over changes from default map.Sean Reifschneider1-4/+3
2016-08-19Adding jafo layout.Sean Reifschneider5-0/+214
2016-08-19Added compatibility for the Infinity ErgoDox to my Ergodox keymap.Xyverz2-53/+178
2016-08-18One last change to the readme.Xyverz1-3/+1
2016-08-18One last formatting changeXyverz1-1/+1
2016-08-18more formatting changesXyverz1-90/+90
2016-08-18Hopefully this fixes the layout diagrams.Xyverz1-91/+91
2016-08-18Added a readme, tidied up comments in the keymap.Xyverz2-29/+147
2016-08-18Merge branch 'master' of https://github.com/Xyverz/qmk_firmwareXyverz1-0/+5
2016-08-17Update readme.mdXyverz1-1/+1
2016-08-17Create readme.mdXyverz1-0/+5
2016-08-17tap-dance: Major rework, to make it more reliableGergely Nagy1-1/+1
2016-08-14Merge remote-tracking branch 'upstream/master'Xyverz6-1237/+1244
2016-08-13The Ordinary Layout is the unsurprising layoutNicholas Keene10-183/+158
2016-08-12ergodox: Update my keymap to v1.5Gergely Nagy6-1237/+1244
2016-08-10Adding my own layouts for the Phantom and Ergodox. My Ergodox layout adds per...Ian Sterling1-0/+311
2016-08-09Delete keymap.cXyverz1-184/+0
2016-08-09Delete old_keymap.cXyverz1-311/+0
2016-08-09Delete readme.mdXyverz1-10/+0
2016-08-09Delete dvorak.pngXyverz1-0/+0
2016-08-09Adding my own keymaps to the following keyboards:Ian Sterling4-0/+505
2016-08-02Merge pull request #592 from sethbc/ez-sethbcErez Zukerman3-0/+119
2016-08-02Merge pull request #593 from J3RN/masterErez Zukerman2-22/+26
2016-08-02Merge pull request #600 from adiabatic/masterErez Zukerman4-14/+1167
2016-07-31Thumb ⌫ into ⇥, numpad & into :, yank home/endNathan Sharfi3-13/+1166
2016-07-31Merge branch 'master' of github.com:jackhumbert/qmk_firmwareNathan Sharfi178-0/+21862
2016-07-31Generate version information to version.hFred Sundvik3-0/+3
2016-07-30Updated readme with recent changesJonathan Arnett1-3/+6
2016-07-30Updated my keymapJack Humbert2-20/+21
2016-07-30rebaseSeth Chandler3-0/+119
2016-07-30Update some obsolete referencesGergely Nagy1-1/+1
2016-07-29Cleanup the townk_osx config.h and make filesFred Sundvik2-52/+2
2016-07-29Rename supercoder config_user to config.hFred Sundvik1-1/+1
2016-07-29Change _delay_ms to wait_ms in algernon keymapFred Sundvik1-1216/+1217
2016-07-29All Ez keymaps compilesFred Sundvik57-58/+58
2016-07-29Initial structure for Ergodox as subprojectsFred Sundvik178-0/+21911