summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
AgeCommit message (Expand)AuthorFilesLines
2016-12-19Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert6-82/+269
2016-12-19rgb clean-up, api clean-upJack Humbert1-0/+1
2016-12-19Flips off MIDI and API_SYSEXErez Zukerman2-2/+2
2016-12-19Merge pull request #958 from pvinis/masterJack Humbert1-12/+12
2016-12-17Adds a troubleshooting layout for resetting the EEPROMErez Zukerman1-0/+140
2016-12-17Removes alt/j dual functionErez Zukerman1-6/+6
2016-12-16make a sysctl MO button so i can quickly use the arrowsPavlos Vinieratos1-12/+12
2016-12-15Merge pull request #952 from pvinis/masterJack Humbert1-63/+108
2016-12-15Allow power consumption to be set per-keyboard.Kyle Smith1-0/+2
2016-12-10put home/end on thumb clusterlucwastiaux1-2/+2
2016-12-10readme updateslucwastiaux1-1/+4
2016-12-10Merge remote-tracking branch 'upstream/master'lucwastiaux41-233/+1976
2016-12-10use thumb cluster key to toggle brackets layerlucwastiaux2-2/+3
2016-12-09tap dance for some layers. one tap sysctl, two taps mouse.Pavlos Vinieratos1-3/+29
2016-12-09add light for some layersPavlos Vinieratos1-0/+19
2016-12-09separate sysctl and mouse layersPavlos Vinieratos1-57/+57
2016-12-09add alt keyPavlos Vinieratos1-2/+2
2016-12-09media keysPavlos Vinieratos1-11/+11
2016-12-06A new default layout that supports ShineErez Zukerman2-27/+59
2016-12-06Adjusts config for better mousekey supportErez Zukerman1-3/+4
2016-12-02Tweaks Kristian's layout againErez Zukerman1-1/+1
2016-12-02Kristian's keymapErez Zukerman1-0/+79
2016-12-01Better layoutErez Zukerman1-50/+71
2016-11-29Test layout for ErgoDox EZ manufacturing robotErez Zukerman2-0/+135
2016-11-29Merge pull request #918 from jackhumbert/wu5y7Erez Zukerman13-20/+107
2016-11-29guess i didnt pullJack Humbert1-11/+0
2016-11-29Merge branch 'wu5y7' of github.com:jackhumbert/qmk_firmware into wu5y7Jack Humbert4-14/+20
2016-11-29enable rgblight by default for ezJack Humbert2-0/+12
2016-11-29enable api sysex for ezJack Humbert1-0/+1
2016-11-28Add the AZERTY compatibility layer.Olivier2-7/+122
2016-11-28Change layer names (cosmetic change) and reorder them so that the "shift" lay...Olivier1-62/+62
2016-11-28Tweaks position of TOG not to conflict with MOErez Zukerman1-3/+3
2016-11-28A little cleanup, add some comments, change others.Olivier1-26/+16
2016-11-28Tweaks EZ MakefileErez Zukerman1-1/+6
2016-11-28Pulls LED config into common config for EZErez Zukerman2-10/+11
2016-11-28Adjust comment.Olivier1-1/+1
2016-11-28Reorganize the numeric keypad layer more like a traditional numeric keypad.Olivier2-12/+12
2016-11-27Merge https://github.com/jackhumbert/qmk_firmwareOlivier106-1293/+7349
2016-11-26separated into api files/folderJack Humbert2-2/+1
2016-11-24rgblight fixesJack Humbert2-5/+7
2016-11-24travis plsJack Humbert2-2/+4
2016-11-22Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7Jack Humbert7-26/+436
2016-11-22fix infinityJack Humbert2-2/+2
2016-11-22Merge pull request #894 from dchagniot/ergodoxDvorakEmacsJack Humbert2-0/+235
2016-11-22Merge pull request #892 from fredizzimo/disable_ergodox_lcdJack Humbert2-26/+5
2016-11-22merging lets_splitJack Humbert11-13/+925
2016-11-20typo fixDidier Chagniot2-19/+19
2016-11-20Always initialze the Infinity Ergodox backlightFred Sundvik2-26/+5
2016-11-19adds galson keymapsamgalson@gmail.com3-0/+196
2016-11-19wqMerge branch 'wu5y7' of https://github.com/jackhumbert/qmk_firmware into wu5y7Jack Humbert3-7/+42