Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | xyverz | 2016-12-13 | 3 | -27/+62 |
|\ | |||||
| * | put home/end on thumb cluster | lucwastiaux | 2016-12-10 | 1 | -2/+2 |
| | | |||||
| * | readme updates | lucwastiaux | 2016-12-10 | 1 | -1/+4 |
| | | |||||
| * | Merge remote-tracking branch 'upstream/master' | lucwastiaux | 2016-12-10 | 31 | -199/+1935 |
| |\ | |||||
| * | | use thumb cluster key to toggle brackets layer | lucwastiaux | 2016-12-10 | 2 | -2/+3 |
| | | | |||||
| * | | added more shortcut keys | lucwastiaux | 2016-11-05 | 2 | -9/+9 |
| | | | |||||
| * | | updated readme | lucwastiaux | 2016-11-05 | 1 | -1/+2 |
| | | | |||||
| * | | removed brackets anywhere but in brackets layer, added mouse layer back in, ↵ | lucwastiaux | 2016-11-05 | 3 | -20/+50 |
| | | | | | | | | | | | | replaced all HYPR with MEH, put semicolon-newline and end-newline on symbol layer | ||||
* | | | Merge remote-tracking branch 'upstream/master' | xyverz | 2016-12-06 | 19 | -183/+1007 |
|\ \ \ | | |/ | |/| | |||||
| * | | A new default layout that supports Shine | Erez Zukerman | 2016-12-05 | 2 | -27/+59 |
| | | | |||||
| * | | Tweaks Kristian's layout again | Erez Zukerman | 2016-12-02 | 1 | -1/+1 |
| | | | |||||
| * | | Kristian's keymap | Erez Zukerman | 2016-12-02 | 1 | -0/+79 |
| | | | |||||
| * | | Better layout | Erez Zukerman | 2016-11-30 | 1 | -50/+71 |
| | | | |||||
| * | | Test layout for ErgoDox EZ manufacturing robot | Erez Zukerman | 2016-11-29 | 2 | -0/+135 |
| | | | |||||
| * | | Merge pull request #918 from jackhumbert/wu5y7 | Erez Zukerman | 2016-11-29 | 6 | -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 MO | Erez Zukerman | 2016-11-28 | 1 | -3/+3 |
| | | | | |||||
| | * | | Pulls LED config into common config for EZ | Erez Zukerman | 2016-11-28 | 1 | -10/+0 |
| | | | | |||||
| | * | | separated into api files/folder | Jack Humbert | 2016-11-26 | 1 | -1/+1 |
| | | | | |||||
| | * | | rgblight fixes | Jack Humbert | 2016-11-23 | 2 | -5/+7 |
| | | | | |||||
| | * | | travis pls | Jack Humbert | 2016-11-23 | 1 | -2/+2 |
| | | | | |||||
| | * | | Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7 | Jack Humbert | 2016-11-21 | 5 | -0/+431 |
| | |\ \ | |||||
| | * \ \ | merging lets_split | Jack Humbert | 2016-11-21 | 11 | -13/+925 |
| | |\ \ \ | |||||
| | * \ \ \ | wqMerge branch 'wu5y7' of https://github.com/jackhumbert/qmk_firmware into wu5y7 | Jack Humbert | 2016-11-18 | 3 | -7/+42 |
| | |\ \ \ \ | |||||
| | | * | | | | Groundwork for dedicated color keycodes | Erez Zukerman | 2016-11-17 | 1 | -1/+23 |
| | | | | | | | |||||
| | | * | | | | Initial Erez Experimental keymap tweaks | Erez Zukerman | 2016-11-17 | 3 | -6/+19 |
| | | | | | | | |||||
| | * | | | | | midi back and forth | Jack Humbert | 2016-11-18 | 1 | -1/+6 |
| | |/ / / / | |||||
| | * | | | | rgb light through midi | Jack Humbert | 2016-11-17 | 1 | -1/+2 |
| | | | | | | |||||
| | * | | | | mostly working | Jack Humbert | 2016-11-13 | 2 | -1/+4 |
| | | | | | | |||||
| | * | | | | merging | Jack Humbert | 2016-11-12 | 43 | -128/+2489 |
| | |\ \ \ \ | |||||
| | * | | | | | working with power limit | Jack Humbert | 2016-10-16 | 2 | -3/+3 |
| | | | | | | | |||||
| | * | | | | | RGBW lights | Jack Humbert | 2016-10-05 | 3 | -2/+21 |
| | | | | | | | |||||
| * | | | | | | Add the AZERTY compatibility layer. | Olivier | 2016-11-28 | 2 | -7/+122 |
| | | | | | | | |||||
| * | | | | | | Change layer names (cosmetic change) and reorder them so that the "shift" ↵ | Olivier | 2016-11-28 | 1 | -62/+62 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | layer can be accessed from the "alt" layer when in QWERTY compat mode. | ||||
| * | | | | | | A little cleanup, add some comments, change others. | Olivier | 2016-11-28 | 1 | -26/+16 |
| | | | | | | | |||||
| * | | | | | | Adjust comment. | Olivier | 2016-11-28 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Reorganize the numeric keypad layer more like a traditional numeric keypad. | Olivier | 2016-11-28 | 2 | -12/+12 |
| | | | | | | | |||||
| * | | | | | | Merge https://github.com/jackhumbert/qmk_firmware | Olivier | 2016-11-27 | 91 | -1061/+6752 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Merge pull request #894 from dchagniot/ergodoxDvorakEmacs | Jack Humbert | 2016-11-21 | 2 | -0/+235 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Ergodox dvorak emacs | ||||
| | | * | | | | | typo fix | Didier Chagniot | 2016-11-20 | 2 | -19/+19 |
| | | | | | | | | |||||
| | | * | | | | | readme.md updated | Didier Chagniot | 2016-09-10 | 1 | -0/+70 |
| | | | | | | | | |||||
| | | * | | | | | typing with it | Didier Chagniot | 2016-09-09 | 1 | -0/+165 |
| | | | | | | | | |||||
| | * | | | | | | adds galson keymap | samgalson@gmail.com | 2016-11-19 | 3 | -0/+196 |
| | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Rename file following upstream folder rename. | Olivier | 2016-08-20 | 1 | -0/+9 |
| | | | | | | | |||||
| * | | | | | | Merge https://github.com/jackhumbert/qmk_firmware | Olivier | 2016-08-20 | 3 | -82/+34 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge remote-tracking branch 'upstream/master' | xyverz | 2016-11-16 | 55 | -294/+3599 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | dvorak/plover keyboard layout | Seebs | 2016-11-16 | 2 | -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/master | Jack Humbert | 2016-11-16 | 6 | -0/+678 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Added keymap "videck", an ErgoDox keymap for Vi(m) users. | ||||
| | * | | | | | Added keymap "videck", an ErgoDox keymap for Vi(m) users. | Hans Ellegård | 2016-11-13 | 6 | -0/+678 |
| | | |_|/ / | | |/| | | | |||||
| * / | | | | update sethbc ergodox keymap | Seth Chandler | 2016-11-13 | 3 | -13/+3 |
| |/ / / / | |||||
| * | | / | Removed the control action when holding z or / | Jonathan Arnett | 2016-11-06 | 1 | -3/+3 |
| | |_|/ | |/| | |