aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/planck
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Xyverz2017-04-0223-85/+1523
|\
| * Worked around some new Makefile issues.nielsenz2017-03-303-27/+27
| * changed hotkey cluster to accomodate awkward software... againCallum Oakley2017-03-301-1/+1
| * changed hotkey cluster to accomodate awkward softwareCallum Oakley2017-03-301-7/+7
| * Merge branch 'master' into to_pushZay9502017-03-2977-754/+3291
| |\
| | * Merge pull request #1112 from newsboytko/newsboytko/midi-keycodesJack Humbert2017-03-2812-0/+330
| | |\
| | | * Update existing keymapsGabriel Young2017-02-2512-0/+330
| | * | Merge branch 'master' of https://github.com/Khord/qmk_firmwareDylan Khor2017-03-201-4/+4
| | |\ \
| | | * | Missing commaDylan Khor2017-03-191-1/+1
| | | * | Don't feel like tap dancing arrows anymoreDylan Khor2017-03-191-4/+4
| | * | | add pgup, pgdn, home, endDylan Khor2017-03-201-4/+4
| | |/ /
| | * | tap dance working for esc and arrowsDylan Khor2017-03-161-7/+15
| | * | remove constDylan Khor2017-03-161-1/+1
| | * | test td changesDylan Khor2017-03-162-7/+6
| | * | test fixes for tap daneDylan Khor2017-03-162-12/+11
| | * | test tap danceDylan Khor2017-03-163-1/+17
| | * | add config.h for customizationDylan Khor2017-03-161-0/+90
| | * | testDylan Khor2017-03-161-1/+1
| | * | Add MakefileDylan Khor2017-03-151-0/+3
| | * | Add custom keycapDylan Khor2017-03-151-0/+318
| | * | Merge pull request #1090 from qmk/backlight_softpwmJack Humbert2017-03-151-2/+2
| | |\ \
| | | * | mergingJack Humbert2017-02-196-697/+78
| | | |\|
| | | * | adds soft pwm for non-timed portsJack Humbert2017-02-121-2/+2
| | * | | Merge pull request #1145 from smt/smt/lets_splitJack Humbert2017-03-152-77/+134
| | |\ \ \
| | | * | | Update smt keymap READMEsStephen Tudor2017-03-082-31/+52
| | | * | | Update smt keymaps for consistencyStephen Tudor2017-03-081-25/+31
| | | * | | Update smt Planck keymapStephen Tudor2017-02-161-34/+64
| | | | |/ | | | |/|
| * | | | Missed removing a functionZach Nielsen2016-11-101-23/+0
| * | | | Removed some common functions from my keymapnielsenz2016-11-102-13/+4
| * | | | Missed some stuff. Added a song (stole it from reddit).Zach Nielsen2016-11-103-61/+5
| * | | | Adding my (zach) keymaps for planck and preonicZach Nielsen2016-11-104-0/+706
* | | | | Tidied up keymaps, Makefiles that actually work, Clueboard make v1.0Xyverz2017-03-293-31/+12
* | | | | Merge remote-tracking branch 'upstream/master'Xyverz2017-03-037-91/+116
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #1126 from folkert4/masterJack Humbert2017-03-034-70/+95
| |\ \ \ \
| | * | | | Various QOL changes:folkert42017-02-284-70/+95
| * | | | | moar hotkeysCallum Oakley2017-03-022-11/+11
| |/ / / /
| * | | | Update default maps for missing keysChris Helming2017-02-281-8/+8
| * | | | updated readmeCallum Oakley2017-02-221-5/+5
| * | | | added hotkey clusterCallum Oakley2017-02-211-7/+7
| | |/ / | |/| |
* | | | Merge remote-tracking branch 'upstream/master'Xyverz2017-02-206-697/+78
|\| | |
| * | | remove more warningsJack Humbert2017-02-162-16/+33
| * | | Merge my Planck-like keyboardsPriyadi Iman Nurcahyo2017-02-152-912/+40
| * | | GUI layer fixesPriyadi Iman Nurcahyo2017-02-141-2/+2
| * | | Alt-tab handling in GUI layerPriyadi Iman Nurcahyo2017-02-141-2/+12
| * | | remove stand alone punc layer switcher for nowPriyadi Iman Nurcahyo2017-02-141-2/+1
| * | | Add explicit punctuation key for greek layersPriyadi Iman Nurcahyo2017-02-141-6/+6
| * | | Func + Num = PuncPriyadi Iman Nurcahyo2017-02-141-8/+8
| * | | move GRV to ESC positionPriyadi Iman Nurcahyo2017-02-131-4/+5
| * | | Fix faux clicky toggle keyPriyadi Iman Nurcahyo2017-02-131-3/+7
| * | | Merge branch 'faux_clicky' into promethiumPriyadi Iman Nurcahyo2017-02-132-1/+6
| |\ \ \