summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Alt-tab handling in GUI layerPriyadi Iman Nurcahyo2017-02-142-5/+25
* remove stand alone punc layer switcher for nowPriyadi Iman Nurcahyo2017-02-142-3/+4
* Add explicit punctuation key for greek layersPriyadi Iman Nurcahyo2017-02-142-12/+12
* Func + Num = PuncPriyadi Iman Nurcahyo2017-02-142-17/+17
* move GRV to ESC positionPriyadi Iman Nurcahyo2017-02-132-8/+9
* Fix faux clicky toggle keyPriyadi Iman Nurcahyo2017-02-131-3/+7
* Merge branch 'faux_clicky' into promethiumPriyadi Iman Nurcahyo2017-02-1310-1/+229
|\
| * Add keycodes to turn on, turn off and toggle faux clickyPriyadi Iman Nurcahyo2017-02-133-0/+43
| * Implement faux-clicky featurePriyadi Iman Nurcahyo2017-02-138-3/+184
* | Merge branch 'promethium' of github.com:priyadi/qmk_firmware into promethiumPriyadi Iman Nurcahyo2017-02-130-0/+0
|\ \
| * | Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2017-02-121-2/+3
| |\|
| * | Update my Planck layoutPriyadi Iman Nurcahyo2017-02-121-151/+365
| * | Forgot to add ifdef to optional featurePriyadi Iman Nurcahyo2017-02-121-0/+2
| * | Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2017-02-1230-231/+756
| |\ \
| * | | Remove assignment warningPriyadi Iman Nurcahyo2017-02-121-1/+1
| * | | Workaround to remove warningPriyadi Iman Nurcahyo2017-02-122-1/+2
| * | | Some space optimization and housekeepingPriyadi Iman Nurcahyo2017-02-121-44/+30
* | | | Update my Planck layoutPriyadi Iman Nurcahyo2017-02-131-151/+365
* | | | Forgot to add ifdef to optional featurePriyadi Iman Nurcahyo2017-02-131-0/+2
* | | | Remove assignment warningPriyadi Iman Nurcahyo2017-02-131-1/+1
* | | | Workaround to remove warningPriyadi Iman Nurcahyo2017-02-132-1/+2
* | | | Some space optimization and housekeepingPriyadi Iman Nurcahyo2017-02-131-44/+30
* | | | adds planck/rev3 makefile so subproject is foundJack Humbert2017-02-121-0/+3
* | | | update travis badgeJack Humbert2017-02-121-1/+1
* | | | Merge pull request #1092 from lucwastiaux/masterJack Humbert2017-02-123-61/+18
|\ \ \ \
| * | | | updated readmeluc wastiaux2017-02-131-1/+1
| * | | | Merge remote-tracking branch 'upstream/master'luc wastiaux2017-02-13157-914/+6390
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1091 from smt/smt/tv44Jack Humbert2017-02-125-0/+415
|\ \ \ \ \
| * | | | | Add smt keymap for tv44 (MiniVan)Stephen Tudor2017-02-125-0/+415
* | | | | | send travis stuff to gitterJack Humbert2017-02-121-0/+7
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #1089 from priyadi/fix_ps2_mouse_warningJack Humbert2017-02-111-2/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Supress warnings from ps2_mouse.hPriyadi Iman Nurcahyo2017-02-121-2/+3
|/ / / /
* | | | Merge pull request #1065 from milestogo/masterJack Humbert2017-02-112-78/+131
|\ \ \ \
| * \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwaremilestogo2017-02-04121-750/+6291
| |\ \ \ \
| * | | | | fixing kinesis rebootmilestogo2017-01-301-2/+2
| * | | | | split kinesis layout into ergodox and planck style symbol layersmilestogo2017-01-271-76/+129
* | | | | | Merge pull request #1082 from priyadi/right-side-dual-functionJack Humbert2017-02-113-10/+24
|\ \ \ \ \ \
| * | | | | | Make room for 'loose keycodes' by halving UNICODE_MAP rangePriyadi Iman Nurcahyo2017-02-111-2/+2
| * | | | | | Implement tap mod dual role for right side mods.Priyadi Iman Nurcahyo2017-02-103-9/+23
* | | | | | | Merge pull request #1085 from priyadi/promethiumJack Humbert2017-02-118-293/+780
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Add regular space to B+N on GUI layer for repeating spacePriyadi Iman Nurcahyo2017-02-111-1/+1
| * | | | | | Switch to Emoji layer using Punc + greekPriyadi Iman Nurcahyo2017-02-111-20/+4
| * | | | | | Turn off capslock when entering num layerPriyadi Iman Nurcahyo2017-02-111-0/+8
| * | | | | | Move X in number layer away from spacePriyadi Iman Nurcahyo2017-02-111-1/+1
| * | | | | | LSpace + RSpace = switch layerPriyadi Iman Nurcahyo2017-02-112-1/+92
| * | | | | | Implement Capslock LEDPriyadi Iman Nurcahyo2017-02-112-4/+22
| * | | | | | simplify battery calculation for nowPriyadi Iman Nurcahyo2017-02-114-24/+92
| * | | | | | Fix emoji layerPriyadi Iman Nurcahyo2017-02-111-1/+1
| * | | | | | RShift + LShift = CapslockPriyadi Iman Nurcahyo2017-02-111-0/+8
| * | | | | | Add reset keycodePriyadi Iman Nurcahyo2017-02-111-2/+2