Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1115 from Skrymir/master | Jack Humbert | 2017-02-21 | 1 | -13/+21 |
|\ | | | | | Update from upstream | ||||
| * | Merge remote-tracking branch 'qmk/master' | Josh Colbeck | 2017-02-21 | 1360 | -32215/+115460 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1097 from stanleylai/master | Jack Humbert | 2017-02-20 | 9 | -74/+60 |
|\ \ | | | | | | | Added support for LED backlight, XD60v2's RGB underglow LED | ||||
| * | | XD60: Added BL_TOGG back to keymap, with 6 backlight steps | Stanley Lai | 2017-02-18 | 2 | -7/+4 |
| | | | |||||
| * | | Updated XD60 readme and photos to reflect v2 PCB | Stanley Lai | 2017-02-18 | 4 | -2/+6 |
| | | | |||||
| * | | Added support for XD60v2 with RGB underglow and LED backlight support | Stanley Lai | 2017-02-13 | 5 | -72/+57 |
| | | | |||||
| * | | Merge remote-tracking branch 'refs/remotes/qmk/master' | Stanley Lai | 2017-02-13 | 307 | -2365/+16213 |
| |\ \ | |||||
* | | | | remove more warnings | Jack Humbert | 2017-02-16 | 5 | -17/+39 |
| | | | | |||||
* | | | | fix travis and reduce warnings | Jack Humbert | 2017-02-16 | 3 | -1/+3 |
| | | | | |||||
* | | | | ignore PRs in versioning | Jack Humbert | 2017-02-16 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #1105 from nrrkeene/master | Jack Humbert | 2017-02-16 | 8 | -80/+165 |
|\ \ \ \ | | | | | | | | | | | The Ordinary Layout v5 | ||||
| * | | | | The Ordinary Layout has all the keys in the right places. | Nicholas Keene | 2017-02-15 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | This is the best layout, really, come look | Nicholas Keene | 2017-02-15 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | The Ordinary Layout is the best one, the one you are looking for. Really. ↵ | Nicholas Keene | 2017-02-15 | 4 | -29/+43 |
| | | | | | | | | | | | | | | | | | | | | Check it out. | ||||
| * | | | | The Ordinary Layout is boring, normal, typical, expected. | Nicholas Keene | 2017-02-14 | 2 | -54/+125 |
| | | | | | |||||
| * | | | | The Ordinary Layout has a feature for one-handed chorded typing | Nicholas Keene | 2017-02-14 | 2 | -3/+3 |
| | | | | | |||||
| * | | | | All my friends us The Ordinary Layout because it doesn't force you to change ↵ | Nicholas Keene | 2017-02-14 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | you typing habits | ||||
| * | | | | The Ordinary Layout now has more symbols on the Symbols layer! So useful! | Nicholas Keene | 2017-02-14 | 2 | -11/+11 |
| | | | | | |||||
* | | | | | Merge pull request #1103 from priyadi/promethium | Jack Humbert | 2017-02-16 | 9 | -970/+468 |
|\ \ \ \ \ | | | | | | | | | | | | | My keymap updates | ||||
| * | | | | | Added README for my keymap | Priyadi Iman Nurcahyo | 2017-02-15 | 2 | -0/+44 |
| | | | | | | |||||
| * | | | | | Move keyboard specific stuff to keyboard specific files, and vice versa | Priyadi Iman Nurcahyo | 2017-02-15 | 5 | -116/+168 |
| | | | | | | |||||
| * | | | | | Added copyright notice | Priyadi Iman Nurcahyo | 2017-02-15 | 1 | -2/+14 |
| | | | | | | |||||
| * | | | | | Merge my Planck-like keyboards | Priyadi Iman Nurcahyo | 2017-02-15 | 4 | -976/+144 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into promethium | Priyadi Iman Nurcahyo | 2017-02-15 | 3 | -16/+60 |
| |\ \ \ \ \ | |||||
| * | | | | | | 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 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | 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 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'layer_state_set_kb' into promethium | 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 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | 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 |
| | | | | | | | | | | | | | |