Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | climbalima | 2016-12-10 | 108 | -356/+3734 |
|\ | |||||
| * | Merge pull request #936 from jackhumbert/f/shine_default | Erez Zukerman | 2016-12-06 | 3 | -30/+63 |
| |\ | |||||
| | * | A new default layout that supports Shine | Erez Zukerman | 2016-12-05 | 2 | -27/+59 |
| | * | Adjusts config for better mousekey support | Erez Zukerman | 2016-12-05 | 1 | -3/+4 |
| * | | Merge pull request #921 from Wilba6582/raw_hid | Jack Humbert | 2016-12-05 | 2 | -2/+2 |
| |\ \ | |||||
| | * | | Update planck.c | Jack Humbert | 2016-12-04 | 1 | -14/+0 |
| | * | | Update rules.mk | Jack Humbert | 2016-12-04 | 1 | -3/+2 |
| | * | | Initial version of Raw HID interface | Wilba6582 | 2016-12-01 | 2 | -2/+17 |
| * | | | Remove unnecessary build options | Priyadi Iman Nurcahyo | 2016-12-05 | 2 | -4/+5 |
| * | | | Merge branch 'master' into promethium | Priyadi Iman Nurcahyo | 2016-12-05 | 11 | -193/+5851 |
| |\ \ \ | |||||
| | * \ \ | Merge pull request #932 from climbalima/master | Jack Humbert | 2016-12-04 | 11 | -193/+5851 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Trackpoint initialization | Priyadi Iman Nurcahyo | 2016-12-05 | 2 | -1/+110 |
| * | | | | Merge branch 'master' into promethium | Priyadi Iman Nurcahyo | 2016-12-04 | 68 | -231/+1017 |
| |\| | | | |||||
| | * | | | 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 | 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 |
| | |\ \ \ | |||||
| | | * | | | 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 |
| | * | | | | | | | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | 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 |