aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/planck/keymaps
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'xyverz2016-12-0627-28/+445
|\
| * Merge pull request #930 from cbbrowne/masterJack Humbert2016-12-0213-9/+47
| |\
| | * Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929cbbrowne2016-12-0213-9/+47
| * | adds warnings to 4 keymapsJack Humbert2016-12-024-4/+12
| |/
| * I also want page-down/page-up on UPPER layercbbrowne2016-12-021-1/+1
| * I want page-down/page-up - put those on LOWER-Left/Right near bottom cornercbbrowne2016-12-021-1/+2
| * Improve docs on SYSEX bitcbbrowne2016-12-011-1/+1
| * Make my builds smallercbbrowne2016-12-012-3/+7
| * Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-298-8/+373
| |\
| | * working with helper, qmk_helper_windows@05b0105Jack Humbert2016-11-212-6/+6
| | * rgb light through midiJack Humbert2016-11-172-2/+2
| | * mergingJack Humbert2016-11-128-9/+796
| | |\
| | * | working with power limitJack Humbert2016-10-164-0/+365
| * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-312-58/+98
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-261-4/+4
| |\ \ \
| * \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChris Browne2016-10-163-0/+444
| |\ \ \ \
| * | | | | I keep mis-using UPPER|LOWER/SLASH, and getting RESET.cbbrowne2016-10-121-2/+3
* | | | | | Merge remote-tracking branch 'upstream/master'xyverz2016-11-168-83/+800
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #839 from priyadi/planck-priyadi-modificationJack Humbert2016-10-302-58/+98
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Use WinCompose unicode input method instead of HexNumpadPriyadi Iman Nurcahyo2016-10-231-1/+1
| | * | | | Update priyadi's keymap for Planck; added readmePriyadi Iman Nurcahyo2016-10-222-57/+97
| | | |/ / | | |/| |
| * | | | replace lock key with general power keyCallum Oakley2016-10-251-2/+2
| * | | | switched to standard volume keysCallum Oakley2016-10-251-2/+2
| |/ / /
| * | | Merge pull request #815 from priyadi/unicode_mapJack Humbert2016-10-163-0/+444
| |\ \ \ | | |/ / | |/| |
| | * | Add example keymapPriyadi Iman Nurcahyo2016-10-103-0/+444
| * | | New Planck keymap: vifonWojciech Siewierski2016-10-093-0/+303
| |/ /
| * | updated readmeCallum Oakley2016-10-061-3/+3
| * | added lock screen button and fixed error in diagramCallum Oakley2016-10-061-4/+4
| |/
| * Made some simplifications leveraging the LALT(), LGUI(), and S() functions.Callum Oakley2016-10-011-76/+6
* | Merge remote-tracking branch 'jackhumbert/master'xyverz2016-09-309-129/+755
|\|
| * added en-dash and gbp keys and updated readmeCallum Oakley2016-09-292-96/+91
| * big restructure now I only have to consider macOS, also added mouse, more fun...Callum Oakley2016-09-291-23/+116
| * removed windows layer and updated brightness keys for macOS SierraCallum Oakley2016-09-291-76/+14
| * changed RALT to LALT on WindowsCallum Oakley2016-09-291-1/+1
| * fixed commentsCallum Oakley2016-09-291-10/+10
| * Update readme.mdCallum Oakley2016-09-291-9/+9
| * Update readme.mdCallum Oakley2016-09-291-2/+2
| * updated readmeCallum Oakley2016-09-292-28/+83
| * added close key for alt-f4 macroCallum Oakley2016-09-291-3/+14
| * added a toggle between Mac and Windows base layers (with swapped cmd and ctrl)Callum Oakley2016-09-291-11/+48
| * Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-09-223-0/+340
| |\
| | * Fixed Impossible Layout readme tables (again)UnderSampled2016-09-211-0/+12
| | * Corrected Impossible Layout readme tablesStephen Christie2016-09-211-30/+0
| | * Filled Impossible Layout documentationStephen Christie2016-09-211-1/+90
| | * Fixed Qwerty Fn layer to match documented designStephen Christie2016-09-201-5/+5
| | * Merge branch 'master' of http://github.com/jackhumbert/qmk_firmwareStephen Christie2016-09-1938-347/+2774
| | |\
| | * \ Merge branch 'master' of http://github.com/jackhumbert/qmk_firmwareStephen Christie2016-08-0210-79/+832
| | |\ \
| | * | | Moved Insert, PrtSc, Pause to Adjust; Corner enterStephen Christie2016-08-021-35/+35
| | * | | Corrected Qwerty/Fn Mismatch.Stephen Christie2016-08-011-4/+4
| | * | | Added quote key.Stephen Christie2016-07-311-7/+7