Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #932 from climbalima/master | Jack Humbert | 2016-12-04 | 11 | -193/+5851 |
|\ | | | | | Added ponoko svg for lets split | ||||
| * | having trouble with conflicts | climbalima | 2016-12-03 | 3 | -20/+0 |
| | | |||||
| * | cleaned up personal projects | climbalima | 2016-12-03 | 21 | -7375/+0 |
| | | |||||
| * | Merge https://github.com/climbalima/qmk_firmware | climbalima | 2016-12-03 | 3 | -22/+35 |
| |\ | |||||
| * | | added plate files for lets split | climbalima | 2016-12-03 | 21 | -0/+7375 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | climbalima | 2016-12-03 | 2 | -1/+5834 |
| |\ \ | |||||
| * | | | just saving | climbalima | 2016-11-18 | 10 | -232/+54 |
| | | | | |||||
* | | | | Merge pull request #930 from cbbrowne/master | Jack Humbert | 2016-12-02 | 13 | -9/+47 |
|\ \ \ \ | | | | | | | | | | | Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929 | ||||
| * | | | | Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929 | cbbrowne | 2016-12-02 | 13 | -9/+47 |
| | | | | | |||||
* | | | | | adds warnings to 4 keymaps | Jack Humbert | 2016-12-02 | 4 | -4/+12 |
|/ / / / | |||||
* | | | | Merge pull request #924 from cbbrowne/master | Jack Humbert | 2016-12-02 | 3 | -7/+13 |
|\ \ \ \ | | | | | | | | | | | Keymapping revs, revisions to documentation on API_SYSEX_ENABLE | ||||
| * | | | | I also want page-down/page-up on UPPER layer | cbbrowne | 2016-12-02 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | I want page-down/page-up - put those on LOWER-Left/Right near bottom corner | cbbrowne | 2016-12-02 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Improve docs on SYSEX bit | cbbrowne | 2016-12-01 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Make my builds smaller | cbbrowne | 2016-12-01 | 2 | -3/+7 |
| | | | | | |||||
| * | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-12-01 | 1 | -50/+71 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-29 | 48 | -211/+845 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-28 | 14 | -0/+1182 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-23 | 50 | -223/+2365 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-16 | 18 | -123/+945 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-07 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-01 | 13 | -480/+1133 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-10-31 | 2 | -58/+98 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-10-26 | 13 | -37/+484 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Chris Browne | 2016-10-23 | 33 | -127/+1549 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Chris Browne | 2016-10-16 | 4 | -72/+445 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-10-13 | 5 | -6/+517 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | 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 | ||||
* | | | | | | | | | | | | | | | | | 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 | 42 | -69/+502 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 14 | -0/+1182 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | / / / / | | | |_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | separated into api files/folder | Jack Humbert | 2016-11-26 | 5 | -25/+4 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | rgblight fixes | Jack Humbert | 2016-11-23 | 2 | -5/+7 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | travis pls | Jack Humbert | 2016-11-23 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7 | Jack Humbert | 2016-11-21 | 21 | -30/+1217 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | fix infinity | Jack Humbert | 2016-11-21 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | merging lets_split | Jack Humbert | 2016-11-21 | 50 | -319/+2097 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | working with helper, qmk_helper_windows@05b0105 | Jack Humbert | 2016-11-21 | 2 | -6/+6 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | |