Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into promethium | Priyadi Iman Nurcahyo | 2017-02-15 | 3 | -16/+60 |
|\ | |||||
| * | Merge pull request #1101 from priyadi/layer_state_set_kb | Jack Humbert | 2017-02-14 | 2 | -0/+17 |
| |\ | | | | | | | Add weak layer_state_set_kb hook | ||||
| * \ | Merge pull request #1094 from priyadi/faux_clicky | Jack Humbert | 2017-02-13 | 10 | -3/+227 |
| |\ \ | | | | | | | | | Implement faux-clicky feature | ||||
| * \ \ | Merge pull request #1095 from Mauin/gonnerd/reset_documentation | Jack Humbert | 2017-02-13 | 3 | -16/+60 |
| |\ \ \ | | | | | | | | | | | GON NerD: Add reset button to documentation and default keymap | ||||
| | * | | | define missing KC_NO macro | Marvin Ramin | 2017-02-13 | 1 | -6/+7 |
| | | | | | |||||
| | * | | | adds documentation for reset button and adds one to the default keymap | Marvin Ramin | 2017-02-13 | 3 | -15/+58 |
| |/ / / | |||||
* | | | | Move Alt-Tab position | Priyadi Iman Nurcahyo | 2017-02-15 | 1 | -4/+4 |
| | | | | |||||
* | | | | Merge branch 'layer_state_set_kb' into promethium | Priyadi Iman Nurcahyo | 2017-02-15 | 1 | -2/+2 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Fix bug fix attempt | Priyadi Iman Nurcahyo | 2017-02-15 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge branch 'layer_state_set_kb' into promethium | Priyadi Iman Nurcahyo | 2017-02-15 | 0 | -0/+0 |
|\| | | | |||||
| * | | | Bug fix & added default_layer_state_set_kb | Priyadi Iman Nurcahyo | 2017-02-15 | 2 | -2/+11 |
| | | | | |||||
* | | | | Bug fix & added default_layer_state_set_kb | Priyadi Iman Nurcahyo | 2017-02-15 | 2 | -2/+11 |
| | | | | |||||
* | | | | Merge branch 'layer_state_set_kb' into promethium | Priyadi Iman Nurcahyo | 2017-02-15 | 2 | -0/+8 |
|\| | | | |||||
| * | | | Add layer_state_set_kb hook | Priyadi Iman Nurcahyo | 2017-02-15 | 2 | -0/+8 |
| |/ / | |||||
* | | | num, func, punc 3state layer done right | Priyadi Iman Nurcahyo | 2017-02-15 | 2 | -57/+46 |
| | | | |||||
* | | | GUI layer fixes | Priyadi Iman Nurcahyo | 2017-02-14 | 2 | -4/+4 |
| | | | |||||
* | | | Alt-tab handling in GUI layer | Priyadi Iman Nurcahyo | 2017-02-14 | 2 | -5/+25 |
| | | | |||||
* | | | remove stand alone punc layer switcher for now | Priyadi Iman Nurcahyo | 2017-02-14 | 2 | -3/+4 |
| | | | |||||
* | | | Add explicit punctuation key for greek layers | Priyadi Iman Nurcahyo | 2017-02-14 | 2 | -12/+12 |
| | | | |||||
* | | | Func + Num = Punc | Priyadi Iman Nurcahyo | 2017-02-14 | 2 | -17/+17 |
| | | | |||||
* | | | move GRV to ESC position | Priyadi Iman Nurcahyo | 2017-02-13 | 2 | -8/+9 |
| | | | |||||
* | | | Fix faux clicky toggle key | Priyadi Iman Nurcahyo | 2017-02-13 | 1 | -3/+7 |
| | | | |||||
* | | | Merge branch 'faux_clicky' into promethium | Priyadi Iman Nurcahyo | 2017-02-13 | 10 | -1/+229 |
|\ \ \ | | |/ | |/| | |||||
| * | | Add keycodes to turn on, turn off and toggle faux clicky | Priyadi Iman Nurcahyo | 2017-02-13 | 3 | -0/+43 |
| | | | |||||
| * | | Implement faux-clicky feature | Priyadi Iman Nurcahyo | 2017-02-13 | 8 | -3/+184 |
| | | | |||||
* | | | Merge branch 'promethium' of github.com:priyadi/qmk_firmware into promethium | Priyadi Iman Nurcahyo | 2017-02-13 | 0 | -0/+0 |
|\ \ \ | |||||
| * | | | Merge branch 'master' into promethium | Priyadi Iman Nurcahyo | 2017-02-12 | 1 | -2/+3 |
| |\| | | |||||
| * | | | Update my Planck layout | Priyadi Iman Nurcahyo | 2017-02-12 | 1 | -151/+365 |
| | | | | |||||
| * | | | Forgot to add ifdef to optional feature | Priyadi Iman Nurcahyo | 2017-02-12 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into promethium | Priyadi Iman Nurcahyo | 2017-02-12 | 30 | -231/+756 |
| |\ \ \ | |||||
| * | | | | Remove assignment warning | Priyadi Iman Nurcahyo | 2017-02-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Workaround to remove warning | Priyadi Iman Nurcahyo | 2017-02-12 | 2 | -1/+2 |
| | | | | | |||||
| * | | | | Some space optimization and housekeeping | Priyadi Iman Nurcahyo | 2017-02-12 | 1 | -44/+30 |
| | | | | | |||||
* | | | | | Update my Planck layout | Priyadi Iman Nurcahyo | 2017-02-13 | 1 | -151/+365 |
| | | | | | |||||
* | | | | | Forgot to add ifdef to optional feature | Priyadi Iman Nurcahyo | 2017-02-13 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Remove assignment warning | Priyadi Iman Nurcahyo | 2017-02-13 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Workaround to remove warning | Priyadi Iman Nurcahyo | 2017-02-13 | 2 | -1/+2 |
| | | | | | |||||
* | | | | | Some space optimization and housekeeping | Priyadi Iman Nurcahyo | 2017-02-13 | 1 | -44/+30 |
| |_|_|/ |/| | | | |||||
* | | | | adds planck/rev3 makefile so subproject is found | Jack Humbert | 2017-02-12 | 1 | -0/+3 |
| | | | | |||||
* | | | | update travis badge | Jack Humbert | 2017-02-12 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #1092 from lucwastiaux/master | Jack Humbert | 2017-02-12 | 3 | -61/+18 |
|\ \ \ \ | | | | | | | | | | | updated ergodox/dvorak_programmer keymap | ||||
| * | | | | updated readme | luc wastiaux | 2017-02-13 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'upstream/master' | luc wastiaux | 2017-02-13 | 157 | -914/+6390 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #1091 from smt/smt/tv44 | Jack Humbert | 2017-02-12 | 5 | -0/+415 |
|\ \ \ \ \ | | | | | | | | | | | | | Add smt keymap for tv44 (MiniVan) | ||||
| * | | | | | Add smt keymap for tv44 (MiniVan) | Stephen Tudor | 2017-02-12 | 5 | -0/+415 |
| | | | | | | |||||
* | | | | | | send travis stuff to gitter | Jack Humbert | 2017-02-12 | 1 | -0/+7 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #1089 from priyadi/fix_ps2_mouse_warning | Jack Humbert | 2017-02-11 | 1 | -2/+3 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Suppress warnings from ps2_mouse.h | ||||
| * | | | | Supress warnings from ps2_mouse.h | Priyadi Iman Nurcahyo | 2017-02-12 | 1 | -2/+3 |
|/ / / / | |||||
* | | | | Merge pull request #1065 from milestogo/master | Jack Humbert | 2017-02-11 | 2 | -78/+131 |
|\ \ \ \ | | | | | | | | | | | Update to kinesis keymaps | ||||
| * \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | milestogo | 2017-02-04 | 121 | -750/+6291 |
| |\ \ \ \ |