summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\
| * Merge pull request #894 from dchagniot/ergodoxDvorakEmacsJack Humbert2016-11-212-0/+235
| |\ | | | | | | Ergodox dvorak emacs
| | * 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 initialize the Infinity Ergodox backlight
| | * | Always initialze the Infinity Ergodox backlightFred Sundvik2016-11-202-26/+5
| | | | | | | | | | | | | | | | | | | | Otherwise it will stay lit. The set_led functionality is also disabled since it doesn't work properly for slaves.
| * | | adds galson keymapsamgalson@gmail.com2016-11-193-0/+196
| |/ /
* | | fix infinityJack Humbert2016-11-212-2/+2
| | |
* | | merging lets_splitJack Humbert2016-11-2111-13/+925
|\| |
| * | dvorak/plover keyboard layoutSeebs2016-11-162-0/+244
| | | | | | | | | | | | | | | | | | | | | Plover's steno support likes quasi-qwerty, and gaming likes qwerty, and I like dvorak, so... what if I could have it all? Signed-off-by: seebs <seebs@seebs.net>
| * | Merge pull request #880 from psyill/masterJack Humbert2016-11-166-0/+678
| |\ \ | | | | | | | | Added keymap "videck", an ErgoDox keymap for Vi(m) users.
| | * | Added keymap "videck", an ErgoDox keymap for Vi(m) users.Hans EllegÄrd2016-11-136-0/+678
| | | |
| * | | update sethbc ergodox keymapSeth Chandler2016-11-133-13/+3
| |/ /
* | | 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
|\| |
| * | Removed the control action when holding z or /Jonathan Arnett2016-11-061-3/+3
| | |
| * | Implements dedicated text zoom keysErez Zukerman2016-11-012-3/+7
| | |
| * | Merge pull request #851 from J3RN/momentaryErez Zukerman2016-10-311-5/+5
| |\ \ | | | | | | | | Switched to momentary
| | * | Switched to momentaryJonathan Arnett2016-10-091-5/+5
| | | | | | | | | | | | | | | | | | | | Also updated the style of these lines slightly to match the style of the default keymap
| * | | Merge pull request #843 from lucwastiaux/masterErez Zukerman2016-10-313-0/+426
| |\ \ \ | | | | | | | | | | Adding Ergodox Dvorak Programmer layout
| | * | | re-introduce brackets layerlucwastiaux2016-10-261-2/+24
| | | | |
| | * | | adding readmelucwastiaux2016-10-231-0/+15
| | | | |
| | * | | add up/down keys on thumb clusterslucwastiaux2016-10-231-2/+2
| | | | |
| | * | | remove brackets layer, replace a few shortcuts on thumb clusterlucwastiaux2016-10-231-30/+13
| | | | |
| | * | | type brackets in symbol layer, using bottom rowlucwastiaux2016-10-232-8/+18
| | | | |
| | * | | add tap-dance support, make right shift double-tap=caplocklucwastiaux2016-10-222-1/+16
| | | | |
| | * | | change include fileslucwastiaux2016-10-221-1/+2
| | | | |
| | * | | added dvorak programmer layoutlucwastiaux2016-10-221-0/+380
| | | | |
| * | | | Merge pull request #836 from 20lives/masterErez Zukerman2016-10-317-472/+695
| |\ \ \ \ | | | | | | | | | | | | added new layout
| | * | | | merge upstreamLior Haim2016-10-2312-21/+698
| | |\| | |
| | * | | | fixed copy-cut-paste buttonstwentylives2016-10-211-5/+5
| | | | | |
| | * | | | Merge branch 'master' of https://github.com/20lives/qmk_firmwaretwentylives2016-10-201-2/+2
| | |\ \ \ \
| | | * | | | fix readme20lives2016-10-191-2/+2
| | | | | | |
| | * | | | | fixed base layer = keytwentylives2016-10-201-1/+1
| | |/ / / /
| | * | | | update pics and readmetwentylives2016-10-195-133/+122
| | | | | |