Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | gh60 satan spacefn | Eric Dodd | 2017-03-01 | 3 | -0/+160 |
| | |||||
* | gh60 spacefn | Eric Dodd | 2017-03-01 | 5 | -0/+550 |
| | |||||
* | Merge pull request #1124 from jmdaly/roadkit_firmware | Jack Humbert | 2017-02-28 | 14 | -0/+499 |
|\ | | | | | Add initial version of TheVan Keyboards Roadkit Firmware | ||||
| * | Add initial version of TheVan Keyboards Roadkit Firmware | John M Daly | 2017-02-28 | 14 | -0/+499 |
| | | |||||
* | | Merge pull request #1125 from cwhits/upstream | Jack Humbert | 2017-02-28 | 1 | -8/+8 |
|\ \ | |/ |/| | [Planck] Update default keymap for missing keys | ||||
| * | Update default maps for missing keys | Chris Helming | 2017-02-28 | 1 | -8/+8 |
|/ | |||||
* | Merge pull request #1116 from hot-leaf-juice/master | Jack Humbert | 2017-02-27 | 2 | -12/+12 |
|\ | | | | | keymap update | ||||
| * | updated readme | Callum Oakley | 2017-02-22 | 1 | -5/+5 |
| | | |||||
| * | added hotkey cluster | Callum Oakley | 2017-02-21 | 1 | -7/+7 |
| | | |||||
* | | Merge pull request #1119 from phongnh/master | Jack Humbert | 2017-02-27 | 1 | -1/+1 |
|\ \ | | | | | | | Removes redundant {} which cause build failure when DEBUG_ACTION is set | ||||
| * | | Removes redundant {} which cause build failure when DEBUG_ACTION is set | Phong Nguyen | 2017-02-25 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1121 from Leszek111/master | Jack Humbert | 2017-02-27 | 5 | -0/+280 |
|\ \ \ | |/ / |/| | | add layout | ||||
| * | | Ammend readme.md | 2017-02-27 | 1 | -2/+4 | |
| | | | |||||
| * | | Add colemak_programmer | 2017-02-27 | 5 | -0/+278 | |
| | | | |||||
* | | | Merge pull request #1118 from priyadi/promethium | Jack Humbert | 2017-02-23 | 2 | -26/+33 |
|\ \ \ | | | | | | | | | Various keymap updates | ||||
| * | | | Fix UNICODE_MAP input_mode problem | Priyadi Iman Nurcahyo | 2017-02-23 | 1 | -4/+6 |
| | | | | |||||
| * | | | Merge branch 'master' into promethium | Priyadi Iman Nurcahyo | 2017-02-23 | 17 | -104/+360 |
| |\ \ \ | |||||
| * | | | | 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 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 |
| |\ \ \ \ \ | |||||
| * | | | | | | reposition ins and del key | Priyadi Iman Nurcahyo | 2017-02-16 | 2 | -13/+17 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1117 from priyadi/fix_unicode_map | Jack Humbert | 2017-02-23 | 1 | -4/+6 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Fix UNICODE_MAP input_mode problem | ||||
| * | | | | | | Fix UNICODE_MAP input_mode problem | Priyadi Iman Nurcahyo | 2017-02-23 | 1 | -4/+6 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #1113 from kesslern/master | Jack Humbert | 2017-02-21 | 2 | -0/+240 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add dvorak_emacs_software layout for ergodox | ||||
| * | | | | | | 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 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | 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 |
| | | | | | | |