Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'refs/remotes/qmk/master' | Stanley Lai | 2017-02-13 | 307 | -2365/+16213 |
|\ | |||||
| * | 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. | ||||
| | * | | | | | Make room for 'loose keycodes' by halving UNICODE_MAP range | Priyadi Iman Nurcahyo | 2017-02-11 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Implement tap mod dual role for right side mods. | Priyadi Iman Nurcahyo | 2017-02-10 | 3 | -9/+23 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1085 from priyadi/promethium | Jack Humbert | 2017-02-11 | 8 | -293/+780 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Promethium keyboard layout update | ||||
| | * | | | | | | Add regular space to B+N on GUI layer for repeating space | Priyadi Iman Nurcahyo | 2017-02-11 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Switch to Emoji layer using Punc + greek | Priyadi Iman Nurcahyo | 2017-02-11 | 1 | -20/+4 |
| | | | | | | | | |||||
| | * | | | | | | Turn off capslock when entering num layer | Priyadi Iman Nurcahyo | 2017-02-11 | 1 | -0/+8 |
| | | | | | | | | |||||
| | * | | | | | | Move X in number layer away from space | Priyadi Iman Nurcahyo | 2017-02-11 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | LSpace + RSpace = switch layer | Priyadi Iman Nurcahyo | 2017-02-11 | 2 | -1/+92 |
| | | | | | | | | |||||
| | * | | | | | | Implement Capslock LED | Priyadi Iman Nurcahyo | 2017-02-11 | 2 | -4/+22 |
| | | | | | | | | |||||
| | * | | | | | | simplify battery calculation for now | Priyadi Iman Nurcahyo | 2017-02-11 | 4 | -24/+92 |
| | | | | | | | | |||||
| | * | | | | | | Fix emoji layer | Priyadi Iman Nurcahyo | 2017-02-11 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | RShift + LShift = Capslock | Priyadi Iman Nurcahyo | 2017-02-11 | 1 | -0/+8 |
| | | | | | | | | |||||
| | * | | | | | | Add reset keycode | Priyadi Iman Nurcahyo | 2017-02-11 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Generalize layer indicators | Priyadi Iman Nurcahyo | 2017-02-11 | 2 | -83/+61 |
| | | | | | | | | |||||
| | * | | | | | | Add ifdefs for keyboard layouts | Priyadi Iman Nurcahyo | 2017-02-10 | 2 | -13/+29 |
| | | | | | | | | |||||
| | * | | | | | | Implement battery level indicator | Priyadi Iman Nurcahyo | 2017-02-10 | 6 | -11/+97 |
| | | | | | | | | |||||
| | * | | | | | | Add function to cycle backlight modes | Priyadi Iman Nurcahyo | 2017-02-10 | 1 | -78/+74 |
| | | | | | | | | |||||
| | * | | | | | | Activate SYS layer by pressing both Ctrls | Priyadi Iman Nurcahyo | 2017-02-10 | 1 | -9/+25 |
| | | | | | | | | |||||
| | * | | | | | | Restore GUI layer | Priyadi Iman Nurcahyo | 2017-02-10 | 1 | -13/+11 |
| | | | | | | | | |||||
| | * | | | | | | Add slash/question mark to punc/num layer | Priyadi Iman Nurcahyo | 2017-02-10 | 1 | -9/+9 |
| | | | | | | | | |||||
| | * | | | | | | Reimplement GUI Layer | Priyadi Iman Nurcahyo | 2017-02-10 | 1 | -20/+21 |
| | | | | | | | | |||||
| | * | | | | | | Reorganize punctuation & numbers layer | Priyadi Iman Nurcahyo | 2017-02-10 | 1 | -12/+12 |
| | | | | | | | | |||||
| | * | | | | | | Fix LED indicator | Priyadi Iman Nurcahyo | 2017-02-10 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Add dvorak & norman layout. Add sys layer. | Priyadi Iman Nurcahyo | 2017-02-10 | 1 | -79/+148 |
| | | | | | | | | |||||
| | * | | | | | | Remove audio stuff | Priyadi Iman Nurcahyo | 2017-02-10 | 1 | -60/+0 |
| | | | | | | | | |||||
| | * | | | | | | Add USB-BLE manual output switching and indicator | Priyadi Iman Nurcahyo | 2017-02-09 | 1 | -12/+44 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'master' into promethium | Priyadi Iman Nurcahyo | 2017-02-09 | 92 | -370/+3945 |
| | |\| | | | | | |||||
| | * | | | | | | Merge branch 'promethium' of github.com:priyadi/qmk_firmware into promethium | Priyadi Iman Nurcahyo | 2017-01-29 | 0 | -0/+0 |
| | |\ \ \ \ \ \ |