Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-10-13 | 7 | -7/+523 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | I keep mis-using UPPER|LOWER/SLASH, and getting RESET. | cbbrowne | 2016-10-12 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With RESET shifted to the UPPER+LOWER layer, it is now time to change that key to Alt-Slash, which, in Emacs, does automatic word completion | |||||
| * | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:cbbrowne/qmk_firmware | cbbrowne | 2016-10-12 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Chris Browne | 2016-10-10 | 13 | -26/+433 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:cbbrowne/qmk_firmware | Chris Browne | 2016-10-10 | 6864 | -2402769/+107777 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-02-06 | 9 | -1515/+1177 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | | | | | | | | | | | | | | | | | | | | | Annotates nordic | Erez Zukerman | 2016-12-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | 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 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge pull request #919 from jackhumbert/hf/robot_test_layout | Jack Humbert | 2016-11-29 | 4 | -0/+143 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test layout for ErgoDox EZ manufacturing robot | |||||
| * | | | | | | | | | | | | | | | | | | | Test layout for ErgoDox EZ manufacturing robot | Erez Zukerman | 2016-11-29 | 4 | -0/+143 | |
|/ / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | Merge pull request #918 from jackhumbert/wu5y7 | Erez Zukerman | 2016-11-29 | 65 | -204/+1761 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds Ergodox EZ RGB lights (both sides using I2C) and implements API base, Midi SysEx API | |||||
| * | | | | | | | | | | | | | | | | | | | guess i didnt pull | Jack Humbert | 2016-11-29 | 1 | -11/+0 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | Merge branch 'wu5y7' of github.com:jackhumbert/qmk_firmware into wu5y7 | Jack Humbert | 2016-11-29 | 4 | -14/+20 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | Tweaks position of TOG not to conflict with MO | Erez Zukerman | 2016-11-28 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | Tweaks EZ Makefile | Erez Zukerman | 2016-11-28 | 1 | -1/+6 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | Pulls LED config into common config for EZ | Erez Zukerman | 2016-11-28 | 2 | -10/+11 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | enable rgblight by default for ez | Jack Humbert | 2016-11-29 | 2 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | enable api sysex for ez | Jack Humbert | 2016-11-29 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7 | Jack Humbert | 2016-11-28 | 22 | -56/+1415 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | separated into api files/folder | Jack Humbert | 2016-11-26 | 15 | -283/+303 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | rgblight fixes | Jack Humbert | 2016-11-23 | 3 | -6/+8 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | travis pls | Jack Humbert | 2016-11-23 | 6 | -52/+56 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | converted to new format | Jack Humbert | 2016-11-23 | 4 | -115/+206 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | converted to 8bit messages | Jack Humbert | 2016-11-23 | 3 | -53/+70 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7 | Jack Humbert | 2016-11-21 | 22 | -32/+1226 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | fix infinity | Jack Humbert | 2016-11-21 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | cleaning up midid | Jack Humbert | 2016-11-21 | 3 | -51/+59 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | cleaning up new code | Jack Humbert | 2016-11-21 | 4 | -64/+73 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | merging lets_split | Jack Humbert | 2016-11-21 | 54 | -445/+2361 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | |