summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2017-02-153-16/+60
|\
| * Merge pull request #1101 from priyadi/layer_state_set_kbJack Humbert2017-02-142-0/+17
| |\ | | | | | | Add weak layer_state_set_kb hook
| * \ Merge pull request #1094 from priyadi/faux_clickyJack Humbert2017-02-1310-3/+227
| |\ \ | | | | | | | | Implement faux-clicky feature
| * \ \ Merge pull request #1095 from Mauin/gonnerd/reset_documentationJack Humbert2017-02-133-16/+60
| |\ \ \ | | | | | | | | | | GON NerD: Add reset button to documentation and default keymap
| | * | | define missing KC_NO macroMarvin Ramin2017-02-131-6/+7
| | | | |
| | * | | adds documentation for reset button and adds one to the default keymapMarvin Ramin2017-02-133-15/+58
| |/ / /
* | | | Move Alt-Tab positionPriyadi Iman Nurcahyo2017-02-151-4/+4
| | | |
* | | | Merge branch 'layer_state_set_kb' into promethiumPriyadi Iman Nurcahyo2017-02-151-2/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix bug fix attemptPriyadi Iman Nurcahyo2017-02-151-2/+2
| | | |
* | | | Merge branch 'layer_state_set_kb' into promethiumPriyadi Iman Nurcahyo2017-02-150-0/+0
|\| | |
| * | | Bug fix & added default_layer_state_set_kbPriyadi Iman Nurcahyo2017-02-152-2/+11
| | | |
* | | | Bug fix & added default_layer_state_set_kbPriyadi Iman Nurcahyo2017-02-152-2/+11
| | | |
* | | | Merge branch 'layer_state_set_kb' into promethiumPriyadi Iman Nurcahyo2017-02-152-0/+8
|\| | |
| * | | Add layer_state_set_kb hookPriyadi Iman Nurcahyo2017-02-152-0/+8
| |/ /
* | | num, func, punc 3state layer done rightPriyadi Iman Nurcahyo2017-02-152-57/+46
| | |
* | | GUI layer fixesPriyadi Iman Nurcahyo2017-02-142-4/+4
| | |
* | | 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 ergodox/dvorak_programmer keymap
| * | | | 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)
| * | | | | 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
|\ \ \ \ \ | |_|_|_|/ |/| | | | Suppress warnings from ps2_mouse.h
| * | | | Supress warnings from ps2_mouse.hPriyadi Iman Nurcahyo2017-02-121-2/+3
|/ / / /
* | | | Merge pull request #1065 from milestogo/masterJack Humbert2017-02-112-78/+131
|\ \ \ \ | | | | | | | | | | Update to kinesis keymaps
| * \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwaremilestogo2017-02-04121-750/+6291
| |\ \ \ \