summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
Commit message (Expand)AuthorAgeFilesLines
* document BRACKETS and SHELL_LAYERlucwastiaux2017-01-221-1/+6
* make shell layer more compatible with default layerlucwastiaux2017-01-211-15/+16
* couple of changes to the shell layerlucwastiaux2017-01-211-4/+4
* introduce shell_layerlucwastiaux2017-01-191-3/+31
* put shell nav under tab, introduce an OSL for the brackets layerlucwastiaux2017-01-171-4/+5
* enable brackets using the - key on the right, and cleanupslucwastiaux2016-12-151-8/+8
* put home/end on thumb clusterlucwastiaux2016-12-101-2/+2
* readme updateslucwastiaux2016-12-101-1/+4
* Merge remote-tracking branch 'upstream/master'lucwastiaux2016-12-1041-233/+1976
|\
| * A new default layout that supports ShineErez Zukerman2016-12-052-27/+59
| * Adjusts config for better mousekey supportErez Zukerman2016-12-051-3/+4
| * Tweaks Kristian's layout againErez Zukerman2016-12-021-1/+1
| * Kristian's keymapErez Zukerman2016-12-021-0/+79
| * Better layoutErez Zukerman2016-11-301-50/+71
| * Test layout for ErgoDox EZ manufacturing robotErez Zukerman2016-11-292-0/+135
| * Merge pull request #918 from jackhumbert/wu5y7Erez Zukerman2016-11-2913-20/+107
| |\
| | * guess i didnt pullJack Humbert2016-11-291-11/+0
| | * Merge branch 'wu5y7' of github.com:jackhumbert/qmk_firmware into wu5y7Jack Humbert2016-11-294-14/+20
| | |\
| | | * Tweaks position of TOG not to conflict with MOErez Zukerman2016-11-281-3/+3
| | | * Tweaks EZ MakefileErez Zukerman2016-11-281-1/+6
| | | * Pulls LED config into common config for EZErez Zukerman2016-11-282-10/+11
| | * | enable rgblight by default for ezJack Humbert2016-11-292-0/+12
| | * | enable api sysex for ezJack Humbert2016-11-291-0/+1
| | |/
| | * separated into api files/folderJack Humbert2016-11-262-2/+1
| | * rgblight fixesJack Humbert2016-11-232-5/+7
| | * travis plsJack Humbert2016-11-232-2/+4
| | * Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7Jack Humbert2016-11-217-26/+436
| | |\
| | * | fix infinityJack Humbert2016-11-212-2/+2
| | * | merging lets_splitJack Humbert2016-11-2111-13/+925
| | |\ \
| | * \ \ wqMerge branch 'wu5y7' of https://github.com/jackhumbert/qmk_firmware into wu5y7Jack Humbert2016-11-183-7/+42
| | |\ \ \
| | | * | | Groundwork for dedicated color keycodesErez Zukerman2016-11-171-1/+23
| | | * | | Initial Erez Experimental keymap tweaksErez Zukerman2016-11-173-6/+19
| | * | | | midi back and forthJack Humbert2016-11-181-1/+6
| | |/ / /
| | * | | rgb light through midiJack Humbert2016-11-171-1/+2
| | * | | mostly workingJack Humbert2016-11-134-4/+13
| | * | | mergingJack Humbert2016-11-1245-149/+2511
| | |\ \ \
| | * | | | working with power limitJack Humbert2016-10-162-3/+3
| | * | | | RGBW lightsJack Humbert2016-10-054-2/+23
| * | | | | Add the AZERTY compatibility layer.Olivier2016-11-282-7/+122
| * | | | | Change layer names (cosmetic change) and reorder them so that the "shift" lay...Olivier2016-11-281-62/+62
| * | | | | A little cleanup, add some comments, change others.Olivier2016-11-281-26/+16
| * | | | | Adjust comment.Olivier2016-11-281-1/+1
| * | | | | Reorganize the numeric keypad layer more like a traditional numeric keypad.Olivier2016-11-282-12/+12
| * | | | | Merge https://github.com/jackhumbert/qmk_firmwareOlivier2016-11-27106-1293/+7349
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge pull request #894 from dchagniot/ergodoxDvorakEmacsJack Humbert2016-11-212-0/+235
| | |\ \ \ \
| | | * | | | typo fixDidier Chagniot2016-11-202-19/+19
| | | * | | | readme.md updatedDidier Chagniot2016-09-101-0/+70
| | | * | | | typing with itDidier Chagniot2016-09-091-0/+165
| | * | | | | Merge pull request #892 from fredizzimo/disable_ergodox_lcdJack Humbert2016-11-212-26/+5
| | |\ \ \ \ \
| | | * | | | | Always initialze the Infinity Ergodox backlightFred Sundvik2016-11-202-26/+5
| | | | |_|_|/ | | | |/| | |