| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'master' into promethium | Priyadi Iman Nurcahyo | 2017-02-23 | 17 | -104/+360 |
| |\ |
|
| | * | Merge pull request #1113 from kesslern/master | Jack Humbert | 2017-02-21 | 2 | -0/+240 |
| | |\ |
|
| | | * | Add dvorak_emacs_software layout for ergodox | Nathan Kessler | 2017-02-20 | 2 | -0/+240 |
| | * | | Merge pull request #1115 from Skrymir/master | Jack Humbert | 2017-02-21 | 1 | -13/+21 |
| | |\ \
| | |/
| |/| |
|
| | | * | 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 |
| | |\ \ |
|
| | | * | | 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 |
| | | | | * | Merge pull request #4 from Skrymir/macroUpdates | Joshua Colbeck | 2016-07-20 | 1 | -13/+21 |
| | | | | |\ |
|
| | | | | | * | Added reset keys | Josh Colbeck | 2016-07-20 | 1 | -9/+10 |
| | | | | | * | Added open resource macro | Josh Colbeck | 2016-07-12 | 1 | -5/+12 |
| | | | | * | | Merge pull request #3 from jackhumbert/master | Joshua Colbeck | 2016-07-20 | 2 | -10/+16 |
| | | | | |\ \
| | | | | |/
| | | | |/| |
|
| * | | | | | | added pause, prtsc & ins to list of keys to be processed on release | Priyadi Iman Nurcahyo | 2017-02-21 | 1 | -2/+5 |
| * | | | | | | Move caps to FUN layer; add Pause key | Priyadi Iman Nurcahyo | 2017-02-21 | 1 | -12/+4 |
| * | | | | | | Move del back to fun+backspce | Priyadi Iman Nurcahyo | 2017-02-21 | 1 | -3/+3 |
| * | | | | | | Only process Fnumber on key release, and only when layer is still active | Priyadi Iman Nurcahyo | 2017-02-21 | 1 | -0/+10 |
| * | | | | | | Merge branch 'master' into promethium | Priyadi Iman Nurcahyo | 2017-02-17 | 3 | -1/+3 |
| |\| | | | | |
|
| | * | | | | | 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 |
| * | | | | | | Fix integer overflow | Priyadi Iman Nurcahyo | 2017-02-16 | 1 | -6/+4 |
| * | | | | | | Merge branch 'master' into promethium | Priyadi Iman Nurcahyo | 2017-02-16 | 21 | -531/+655 |
| |\| | | | | |
|
| | * | | | | | Merge pull request #1105 from nrrkeene/master | Jack Humbert | 2017-02-16 | 8 | -80/+165 |
| | |\ \ \ \ \ |
|
| | | * | | | | | 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. Che... | Nicholas Keene | 2017-02-15 | 4 | -29/+43 |
| | | * | | | | | 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 |
| | | * | | | | | 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 |
| | |\ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ | Merge pull request #1104 from qmk/layer_tap_toggle | Jack Humbert | 2017-02-15 | 13 | -451/+490 |
| | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | 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 |
| | |/ / / / / / / |
|
| * | / / / / / / | reposition ins and del key | Priyadi Iman Nurcahyo | 2017-02-16 | 2 | -13/+17 |
| | |/ / / / / /
|/| | | | | | |
|
| * | | | | | | | 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 |
| |\| | | | | | |
|
| | * | | | | | | Merge pull request #1101 from priyadi/layer_state_set_kb | Jack Humbert | 2017-02-14 | 2 | -0/+17 |
| | |\ \ \ \ \ \
| | |_|_|/ / /
| |/| | | | | |
|
| | * | | | | | | Merge pull request #1094 from priyadi/faux_clicky | Jack Humbert | 2017-02-13 | 10 | -3/+227 |
| | |\ \ \ \ \ \ |
|
