Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | | | | | 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 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge pull request #1104 from qmk/layer_tap_toggle | Jack Humbert | 2017-02-15 | 13 | -451/+490 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | Adds layer tap toggle as TT(layer) | |||||
| * | | | | | | | | | | | | | | fix weirdness with arm and mods | Jack Humbert | 2017-02-15 | 2 | -19/+20 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | unique variable name | Jack Humbert | 2017-02-15 | 2 | -19/+19 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | publicise variables | Jack Humbert | 2017-02-15 | 2 | -4/+3 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | add unicode common file, get names right | Jack Humbert | 2017-02-15 | 1 | -0/+86 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | add unicode common file, get names right | Jack Humbert | 2017-02-15 | 7 | -209/+137 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | split up unicode systems into different files | Jack Humbert | 2017-02-15 | 9 | -239/+253 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | give error if both unicode/map are enabled | Jack Humbert | 2017-02-15 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | adds layer tap toggle | Jack Humbert | 2017-02-15 | 2 | -4/+12 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | 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 | |||||
| * | | | | | | | | | | | | Fix bug fix attempt | Priyadi Iman Nurcahyo | 2017-02-15 | 1 | -2/+2 | |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | Bug fix & added default_layer_state_set_kb | Priyadi Iman Nurcahyo | 2017-02-15 | 2 | -2/+11 | |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Add layer_state_set_kb hook | Priyadi Iman Nurcahyo | 2017-02-15 | 2 | -0/+8 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #1094 from priyadi/faux_clicky | Jack Humbert | 2017-02-13 | 10 | -3/+227 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | Implement faux-clicky feature | |||||
| * | | | | | | | | | 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 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 | |
|/ / / / / / / / | ||||||
* | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | fixing kinesis reboot | milestogo | 2017-01-30 | 1 | -2/+2 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | split kinesis layout into ergodox and planck style symbol layers | milestogo | 2017-01-27 | 1 | -76/+129 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #1082 from priyadi/right-side-dual-function | Jack Humbert | 2017-02-11 | 3 | -10/+24 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Implement tap mod dual role for right side mods. | |||||
| * | | | | | |