summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-1023-27/+2232
|\
| * Merge pull request #993 from priyadi/greek_layerJack Humbert2017-01-082-5/+193
| |\
| | * Greek alphabet layerPriyadi Iman Nurcahyo2017-01-091-4/+183
| | * om telolet omPriyadi Iman Nurcahyo2017-01-082-1/+10
| * | Merged from upstreamJoshua T2017-01-07277-1030/+35859
| |\|
| | * new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-enL.pngishigoya2017-01-065-3/+57
| | * new file: keyboards/ergodox/keymaps/ishigoya-jp/keymap.cishigoya2017-01-061-0/+962
| | * Merge pull request #983 from common-nighthawk/masterJack Humbert2017-01-042-0/+222
| | |\
| | | * reverts change outside of personal keymap.Daniel2017-01-011-2/+1
| | | * adds dedicated double-quote key.Daniel2017-01-011-5/+9
| | | * removes double-tab brackets and adds back quot to left cmd.Daniel2016-12-061-10/+10
| | | * removes the double actions from the metakeys.Daniel2016-11-271-17/+15
| | | * moves brackets to top row.Daniel2016-11-181-9/+9
| | | * moves brackets from J/K to U/I to remove block of common vim sequence.Daniel2016-09-061-8/+8
| | | * adds tap dance and macro to move underscore and l- and r- brackets to base la...Daniel2016-09-022-25/+57
| | | * adds Hyper key. improves media layer. first attempt at tap dance.Daniel2016-09-012-35/+43
| | | * Merge remote-tracking branch 'upstream/master'Daniel2016-08-31340-7101/+22090
| | | |\
| | | * | minor tweaks to numpad and media layerDaniel2016-08-141-26/+24
| | | * | completes first-pass at media layerDaniel2016-08-121-15/+15
| | | * | completes first-pass at symbol layerDaniel2016-08-121-36/+36
| | | * | completes first-pass at base layerDaniel2016-08-101-0/+183
| | * | | Merge pull request #984 from deadcyclo/masterJack Humbert2017-01-042-0/+283
| | |\ \ \
| | * | | | Added Jeremy’s developers keymap for the PlanckJeremy Cowgar2017-01-042-0/+265
| * | | | | Updated README and images to reflect latest keymapJoshua T2017-01-077-6/+10
| * | | | | Added another Shift on Extend layer.Joshua T2017-01-071-8/+8
| * | | | | Updated Atreus layout to 0.4Joshua T2017-01-061-26/+28
| * | | | | Increased TAPPING_TERM to 200Joshua T2017-01-061-1/+3
| * | | | | Fixed key not matching its diagramJoshua T2017-01-061-1/+1
| * | | | | Added comments with ASCII art keymapsJoshua T2016-10-241-1/+105
| * | | | | Added a bit more detail to headerJoshua T2016-10-151-24/+27
| * | | | | Reversed tilde and graveJoshua T2016-10-151-4/+4
| * | | | | Moved Extend tab and ^tabJoshua T2016-10-151-2/+2
| * | | | | Added = to match AtreusJoshua T2016-10-151-4/+4
| * | | | | Switched Tab and Ctrl backJoshua T2016-10-151-7/+7
| * | | | | Fixed typoJoshua T2016-10-151-1/+1
| * | | | | Added Menu key (the rclick menu)Joshua T2016-10-151-4/+4
| * | | | | Updated layout to 1.2 - lots of changesJoshua T2016-10-151-112/+74
| * | | | | Reduced TAPPING_TERM to 150Joshua T2016-10-151-4/+2
| * | | | | Added Ctrl+` (ConEmu shortcut)Joshua T2016-10-151-1/+1
| * | | | | Merge remote-tracking branch 'upstream/master'Joshua T2016-10-15154-2157/+9342
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Joshua T2016-09-01182-6034/+9444
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Fixed getting "stuck" in gaming layerJoshua T2016-08-241-1/+1
| * | | | | | Merge remote-tracking branch 'upstream/master'Joshua T2016-08-24168-1634/+12955
| |\ \ \ \ \ \
| * | | | | | | Several key placement fixes.Joshua T2016-08-248-11/+21
| * | | | | | | Minor changes to Extend and Number layers.Joshua T2016-08-163-10/+10
| * | | | | | | Moved Shift keys to Z and ?Joshua T2016-08-091-9/+9
| * | | | | | | Merged branch master into masterJoshua T2016-08-0925-166/+1489
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Changed left thumb back to Ctrl/AltJoshua T2016-08-091-11/+8
| * | | | | | | Created keymap-specific config.hJoshua T2016-08-091-0/+63
| * | | | | | | Reverted Ergodox config.hJoshua T2016-08-091-1/+1