summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master'dbroqua2017-04-02252-2662/+9842
|\
| * Merge pull request #18 from qmk/masterDamien2017-03-05252-2662/+9842
| |\ | | | | | | Merge from qmk
| | * Merge pull request #1107 from qmk/clueboard_cleanupskullydazed2017-03-0431-257/+763
| | |\ | | | | | | | | Rework the clueboard keymaps
| | | * Add the mouse_keys layoutskullY2017-02-162-0/+11
| | | |
| | | * Rework the clueboard keymaps a bit.skullY2017-02-1630-257/+752
| | | |
| | * | Merge pull request #1126 from folkert4/masterJack Humbert2017-03-034-70/+95
| | |\ \ | | | | | | | | | | Various QOL changes to Espynn's keymap
| | | * | Various QOL changes:folkert42017-02-284-70/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed some unneeded keys from raise and lower layers moved the + and = signs, backspace is now more intuitive moved all the Function keys to CUSTOM layer added ctrl alt del to CUSTOM layer simplified the layout picture greatly
| | * | | Merge pull request #1129 from unxmaal/unxmaal_spacefnJack Humbert2017-03-038-0/+710
| | |\ \ \ | | | | | | | | | | | | Layout: Spacebar long-press as fn, for GH60 and GH60 Satan boards
| | | * | | gh60 satan spacefnEric Dodd2017-03-013-0/+160
| | | | | |
| | | * | | gh60 spacefnEric Dodd2017-03-015-0/+550
| | | |/ /
| | * | | Merge pull request #1130 from hot-leaf-juice/masterJack Humbert2017-03-032-11/+11
| | |\ \ \ | | | |/ / | | |/| | moar hotkeys
| | | * | moar hotkeysCallum Oakley2017-03-022-11/+11
| | |/ /
| | * | Merge pull request #1124 from jmdaly/roadkit_firmwareJack Humbert2017-02-2814-0/+499
| | |\ \ | | | | | | | | | | Add initial version of TheVan Keyboards Roadkit Firmware
| | | * | Add initial version of TheVan Keyboards Roadkit FirmwareJohn M Daly2017-02-2814-0/+499
| | | | |
| | * | | Merge pull request #1125 from cwhits/upstreamJack Humbert2017-02-281-8/+8
| | |\ \ \ | | | |/ / | | |/| | [Planck] Update default keymap for missing keys
| | | * | Update default maps for missing keysChris Helming2017-02-281-8/+8
| | |/ /
| | * | Merge pull request #1116 from hot-leaf-juice/masterJack Humbert2017-02-272-12/+12
| | |\ \ | | | | | | | | | | keymap update
| | | * | updated readmeCallum Oakley2017-02-221-5/+5
| | | | |
| | | * | added hotkey clusterCallum Oakley2017-02-211-7/+7
| | | | |
| | * | | Merge pull request #1119 from phongnh/masterJack Humbert2017-02-271-1/+1
| | |\ \ \ | | | | | | | | | | | | Removes redundant {} which cause build failure when DEBUG_ACTION is set
| | | * | | Removes redundant {} which cause build failure when DEBUG_ACTION is setPhong Nguyen2017-02-251-1/+1
| | | | | |
| | * | | | Merge pull request #1121 from Leszek111/masterJack Humbert2017-02-275-0/+280
| | |\ \ \ \ | | | |/ / / | | |/| | | add layout
| | | * | | Ammend readme.md2017-02-271-2/+4
| | | | | |
| | | * | | Add colemak_programmer2017-02-275-0/+278
| | | | | |
| | * | | | Merge pull request #1118 from priyadi/promethiumJack Humbert2017-02-232-26/+33
| | |\ \ \ \ | | | | | | | | | | | | | | Various keymap updates
| | | * | | | Fix UNICODE_MAP input_mode problemPriyadi Iman Nurcahyo2017-02-231-4/+6
| | | | | | |
| | | * | | | Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2017-02-2317-104/+360
| | | |\ \ \ \
| | | * | | | | added pause, prtsc & ins to list of keys to be processed on releasePriyadi Iman Nurcahyo2017-02-211-2/+5
| | | | | | | |
| | | * | | | | Move caps to FUN layer; add Pause keyPriyadi Iman Nurcahyo2017-02-211-12/+4
| | | | | | | |
| | | * | | | | Move del back to fun+backspcePriyadi Iman Nurcahyo2017-02-211-3/+3
| | | | | | | |
| | | * | | | | Only process Fnumber on key release, and only when layer is still activePriyadi Iman Nurcahyo2017-02-211-0/+10
| | | | | | | |
| | | * | | | | Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2017-02-173-1/+3
| | | |\ \ \ \ \
| | | * | | | | | Fix integer overflowPriyadi Iman Nurcahyo2017-02-161-6/+4
| | | | | | | | |
| | | * | | | | | Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2017-02-1621-531/+655
| | | |\ \ \ \ \ \
| | | * | | | | | | reposition ins and del keyPriyadi Iman Nurcahyo2017-02-162-13/+17
| | | | | | | | | |
| | * | | | | | | | Merge pull request #1117 from priyadi/fix_unicode_mapJack Humbert2017-02-231-4/+6
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | Fix UNICODE_MAP input_mode problem
| | | * | | | | | | Fix UNICODE_MAP input_mode problemPriyadi Iman Nurcahyo2017-02-231-4/+6
| | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | Merge pull request #1113 from kesslern/masterJack Humbert2017-02-212-0/+240
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add dvorak_emacs_software layout for ergodox
| | | * | | | | | | Add dvorak_emacs_software layout for ergodoxNathan Kessler2017-02-202-0/+240
| | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | Merge pull request #1115 from Skrymir/masterJack Humbert2017-02-211-13/+21
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | Update from upstream
| | | * | | | | | Merge remote-tracking branch 'qmk/master'Josh Colbeck2017-02-211360-32215/+115460
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge pull request #1097 from stanleylai/masterJack Humbert2017-02-209-74/+60
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | Added support for LED backlight, XD60v2's RGB underglow LED
| | | * | | | | | XD60: Added BL_TOGG back to keymap, with 6 backlight stepsStanley Lai2017-02-182-7/+4
| | | | | | | | |
| | | * | | | | | Updated XD60 readme and photos to reflect v2 PCBStanley Lai2017-02-184-2/+6
| | | | | | | | |
| | | * | | | | | Added support for XD60v2 with RGB underglow and LED backlight supportStanley Lai2017-02-135-72/+57
| | | | | | | | |
| | | * | | | | | Merge remote-tracking branch 'refs/remotes/qmk/master'Stanley Lai2017-02-13307-2365/+16213
| | | |\ \ \ \ \ \
| | * | | | | | | | remove more warningsJack Humbert2017-02-165-17/+39
| | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | fix travis and reduce warningsJack Humbert2017-02-163-1/+3
| | | | | | | | |
| | * | | | | | | ignore PRs in versioningJack Humbert2017-02-161-1/+1
| | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge pull request #1105 from nrrkeene/masterJack Humbert2017-02-168-80/+165
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | The Ordinary Layout v5