Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | xyverz | 2016-12-13 | 17 | -52/+520 |
|\ | |||||
| * | Merge pull request #948 from climbalima/master | Jack Humbert | 2016-12-12 | 11 | -9/+438 |
| |\ | | | | | | | svg bug fix and added pilcrow to hand wire | ||||
| | * | svg bug fix and added pilcrow to hand wire | climbalima | 2016-12-12 | 11 | -9/+438 |
| | | | |||||
| * | | re-enable audio and extrakeys | Jack Humbert | 2016-12-12 | 2 | -4/+4 |
| | | | |||||
| * | | Merge pull request #946 from climbalima/master | Jack Humbert | 2016-12-12 | 1 | -11/+19 |
| |\| | | | | | | | Changed lets split svg to support boston meetup pcb | ||||
| | * | changed svg after merge | climbalima | 2016-12-10 | 1 | -470/+470 |
| | | | |||||
| | * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | climbalima | 2016-12-10 | 108 | -356/+3734 |
| | |\ | |||||
| | * | | changed svg to support proto pcb | climbalima | 2016-12-10 | 1 | -474/+482 |
| | | | | |||||
| * | | | Merge pull request #945 from priyadi/planck_priyadi | Jack Humbert | 2016-12-12 | 1 | -6/+2 |
| |\ \ \ | | | | | | | | | | | Remove unneeded options to reduce firmware size | ||||
| | * | | | Remove unneeded options to reduce firmware size | Priyadi Iman Nurcahyo | 2016-12-10 | 1 | -6/+2 |
| | | |/ | | |/| | |||||
| * | | | 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 | 151 | -609/+11350 |
| |\| | | |||||
| * | | | 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 | ||||
* | | | | Changes | xyverz | 2016-12-13 | 3 | -133/+70 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'upstream/master' | xyverz | 2016-12-06 | 118 | -534/+9578 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #936 from jackhumbert/f/shine_default | Erez Zukerman | 2016-12-06 | 3 | -30/+63 |
| |\ \ \ | | | | | | | | | | | Official default factory firmware for ErgoDox EZ Shine | ||||
| | * | | | 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 |
| |\ \ \ \ | | | | | | | | | | | | | Initial version of Raw HID interface | ||||
| | * | | | | 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 |
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | / | | | | |_|/ | | | |/| | | 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 |
| | | | | | | | | |||||
| * | | | | | | | 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 | ||||
| | | * | | | | | | 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 |
| | | |\ \ \ \ \ \ \ \ \ |