summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox/keymaps
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'xyverz2016-12-133-27/+62
|\
| * put home/end on thumb clusterlucwastiaux2016-12-101-2/+2
| |
| * readme updateslucwastiaux2016-12-101-1/+4
| |
| * Merge remote-tracking branch 'upstream/master'lucwastiaux2016-12-1031-199/+1935
| |\
| * | use thumb cluster key to toggle brackets layerlucwastiaux2016-12-102-2/+3
| | |
| * | added more shortcut keyslucwastiaux2016-11-052-9/+9
| | |
| * | updated readmelucwastiaux2016-11-051-1/+2
| | |
| * | removed brackets anywhere but in brackets layer, added mouse layer back in, ↵lucwastiaux2016-11-053-20/+50
| | | | | | | | | | | | replaced all HYPR with MEH, put semicolon-newline and end-newline on symbol layer
* | | Merge remote-tracking branch 'upstream/master'xyverz2016-12-0619-183/+1007
|\ \ \ | | |/ | |/|
| * | A new default layout that supports ShineErez Zukerman2016-12-052-27/+59
| | |
| * | 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-296-15/+75
| |\ \ | | | | | | | | Adds Ergodox EZ RGB lights (both sides using I2C) and implements API base, Midi SysEx API
| | * | Tweaks position of TOG not to conflict with MOErez Zukerman2016-11-281-3/+3
| | | |
| | * | Pulls LED config into common config for EZErez Zukerman2016-11-281-10/+0
| | | |
| | * | separated into api files/folderJack Humbert2016-11-261-1/+1
| | | |
| | * | rgblight fixesJack Humbert2016-11-232-5/+7
| | | |
| | * | travis plsJack Humbert2016-11-231-2/+2
| | | |
| | * | Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7Jack Humbert2016-11-215-0/+431
| | |\ \
| | * \ \ 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-132-1/+4
| | | | | |
| | * | | | mergingJack Humbert2016-11-1243-128/+2489
| | |\ \ \ \
| | * | | | | working with power limitJack Humbert2016-10-162-3/+3
| | | | | | |
| | * | | | | RGBW lightsJack Humbert2016-10-053-2/+21
| | | | | | |
| * | | | | | Add the AZERTY compatibility layer.Olivier2016-11-282-7/+122
| | | | | | |
| * | | | | | Change layer names (cosmetic change) and reorder them so that the "shift" ↵Olivier2016-11-281-62/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | layer can be accessed from the "alt" layer when in QWERTY compat mode.
| * | | | | | 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-2791-1061/+6752
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | 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
| | | | | | | |
| | * | | | | | adds galson keymapsamgalson@gmail.com2016-11-193-0/+196
| | | |_|_|/ / | | |/| | | |
| * | | | | | Rename file following upstream folder rename.Olivier2016-08-201-0/+9
| | | | | | |
| * | | | | | Merge https://github.com/jackhumbert/qmk_firmwareOlivier2016-08-203-82/+34
| | |/ / / / | |/| | | |
* | | | | | Merge remote-tracking branch 'upstream/master'xyverz2016-11-1655-294/+3599
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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
| |/ / / /
| * | | / Removed the control action when holding z or /Jonathan Arnett2016-11-061-3/+3
| | |_|/ | |/| |