aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert2016-12-196-82/+269
|\
| * Flips off MIDI and API_SYSEXErez Zukerman2016-12-192-2/+2
| * Merge pull request #958 from pvinis/masterJack Humbert2016-12-181-12/+12
| |\
| | * make a sysctl MO button so i can quickly use the arrowsPavlos Vinieratos2016-12-161-12/+12
| * | Adds a troubleshooting layout for resetting the EEPROMErez Zukerman2016-12-161-0/+140
| * | Removes alt/j dual functionErez Zukerman2016-12-161-6/+6
| * | Merge pull request #952 from pvinis/masterJack Humbert2016-12-151-63/+108
| |\|
| | * tap dance for some layers. one tap sysctl, two taps mouse.Pavlos Vinieratos2016-12-091-3/+29
| | * add light for some layersPavlos Vinieratos2016-12-091-0/+19
| | * separate sysctl and mouse layersPavlos Vinieratos2016-12-091-57/+57
| | * add alt keyPavlos Vinieratos2016-12-091-2/+2
| | * media keysPavlos Vinieratos2016-12-091-11/+11
| * | Allow power consumption to be set per-keyboard.Kyle Smith2016-12-141-0/+2
* | | rgb clean-up, api clean-upJack Humbert2016-12-191-0/+1
|/ /
* | 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