Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | xyverz | 2016-12-06 | 27 | -28/+445 |
|\ | |||||
| * | 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 |
| |/ | |||||
| * | 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-11-29 | 8 | -8/+373 |
| |\ | |||||
| | * | working with helper, qmk_helper_windows@05b0105 | Jack Humbert | 2016-11-21 | 2 | -6/+6 |
| | | | |||||
| | * | rgb light through midi | Jack Humbert | 2016-11-17 | 2 | -2/+2 |
| | | | |||||
| | * | merging | Jack Humbert | 2016-11-12 | 8 | -9/+796 |
| | |\ | |||||
| | * | | working with power limit | Jack Humbert | 2016-10-16 | 4 | -0/+365 |
| | | | | |||||
| * | | | 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 | 1 | -4/+4 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Chris Browne | 2016-10-16 | 3 | -0/+444 |
| |\ \ \ \ | |||||
| * | | | | | 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 remote-tracking branch 'upstream/master' | xyverz | 2016-11-16 | 8 | -83/+800 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge pull request #839 from priyadi/planck-priyadi-modification | Jack Humbert | 2016-10-30 | 2 | -58/+98 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | Update priyadi's keymap for Planck; added readme | ||||
| | * | | | | Use WinCompose unicode input method instead of HexNumpad | Priyadi Iman Nurcahyo | 2016-10-23 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Update priyadi's keymap for Planck; added readme | Priyadi Iman Nurcahyo | 2016-10-22 | 2 | -57/+97 |
| | | |/ / | | |/| | | |||||
| * | | | | replace lock key with general power key | Callum Oakley | 2016-10-25 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | switched to standard volume keys | Callum Oakley | 2016-10-25 | 1 | -2/+2 |
| |/ / / | |||||
| * | | | Merge pull request #815 from priyadi/unicode_map | Jack Humbert | 2016-10-16 | 3 | -0/+444 |
| |\ \ \ | | |/ / | |/| | | Allow unicode up to 0xFFFFF using separate mapping table | ||||
| | * | | Add example keymap | Priyadi Iman Nurcahyo | 2016-10-10 | 3 | -0/+444 |
| | | | | |||||
| * | | | New Planck keymap: vifon | Wojciech Siewierski | 2016-10-09 | 3 | -0/+303 |
| |/ / | |||||
| * | | updated readme | Callum Oakley | 2016-10-06 | 1 | -3/+3 |
| | | | |||||
| * | | added lock screen button and fixed error in diagram | Callum Oakley | 2016-10-06 | 1 | -4/+4 |
| |/ | |||||
| * | Made some simplifications leveraging the LALT(), LGUI(), and S() functions. | Callum Oakley | 2016-10-01 | 1 | -76/+6 |
| | | |||||
* | | Merge remote-tracking branch 'jackhumbert/master' | xyverz | 2016-09-30 | 9 | -129/+755 |
|\| | |||||
| * | added en-dash and gbp keys and updated readme | Callum Oakley | 2016-09-29 | 2 | -96/+91 |
| | | |||||
| * | big restructure now I only have to consider macOS, also added mouse, more ↵ | Callum Oakley | 2016-09-29 | 1 | -23/+116 |
| | | | | | | | | function keys, and some neat macros | ||||
| * | removed windows layer and updated brightness keys for macOS Sierra | Callum Oakley | 2016-09-29 | 1 | -76/+14 |
| | | |||||
| * | changed RALT to LALT on Windows | Callum Oakley | 2016-09-29 | 1 | -1/+1 |
| | | |||||
| * | fixed comments | Callum Oakley | 2016-09-29 | 1 | -10/+10 |
| | | |||||
| * | Update readme.md | Callum Oakley | 2016-09-29 | 1 | -9/+9 |
| | | |||||
| * | Update readme.md | Callum Oakley | 2016-09-29 | 1 | -2/+2 |
| | | |||||
| * | updated readme | Callum Oakley | 2016-09-29 | 2 | -28/+83 |
| | | |||||
| * | added close key for alt-f4 macro | Callum Oakley | 2016-09-29 | 1 | -3/+14 |
| | | |||||
| * | added a toggle between Mac and Windows base layers (with swapped cmd and ctrl) | Callum Oakley | 2016-09-29 | 1 | -11/+48 |
| | | |||||
| * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-09-22 | 3 | -0/+340 |
| |\ | |||||
| | * | Fixed Impossible Layout readme tables (again) | UnderSampled | 2016-09-21 | 1 | -0/+12 |
| | | | |||||
| | * | Corrected Impossible Layout readme tables | Stephen Christie | 2016-09-21 | 1 | -30/+0 |
| | | | |||||
| | * | Filled Impossible Layout documentation | Stephen Christie | 2016-09-21 | 1 | -1/+90 |
| | | | |||||
| | * | Fixed Qwerty Fn layer to match documented design | Stephen Christie | 2016-09-20 | 1 | -5/+5 |
| | | | |||||
| | * | Merge branch 'master' of http://github.com/jackhumbert/qmk_firmware | Stephen Christie | 2016-09-19 | 38 | -347/+2774 |
| | |\ | |||||
| | * \ | Merge branch 'master' of http://github.com/jackhumbert/qmk_firmware | Stephen Christie | 2016-08-02 | 10 | -79/+832 |
| | |\ \ | |||||
| | * | | | Moved Insert, PrtSc, Pause to Adjust; Corner enter | Stephen Christie | 2016-08-02 | 1 | -35/+35 |
| | | | | | |||||
| | * | | | Corrected Qwerty/Fn Mismatch. | Stephen Christie | 2016-08-01 | 1 | -4/+4 |
| | | | | | |||||
| | * | | | Added quote key. | Stephen Christie | 2016-07-31 | 1 | -7/+7 |
| | | | | |