summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox/keymaps
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Xyverz2017-01-196-0/+252
|\
| * Merge pull request #999 from deadcyclo/masterJack Humbert2017-01-155-0/+26
| |\
| | * Fixed incorrect layer image in deadcyclo readmeBrendan Johan Lee2017-01-101-1/+1
| | * Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-1010-0/+1642
| | |\
| | * | Added layer images to deadcyclo layout readmeBrendan Johan Lee2017-01-105-0/+26
| * | | Merge pull request #1007 from bryan4887/bryanJack Humbert2017-01-151-0/+226
| |\ \ \ | | |_|/ | |/| |
| | * | Added Bryan's keymapBryan Hernandez2017-01-131-0/+226
* | | | Merge remote-tracking branch 'upstream/master'xyverz2017-01-0820-87/+2215
|\| | |
| * | | Merged from upstreamJoshua T2017-01-0774-388/+5434
| |\ \ \
| | * | | 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
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | 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-011-34/+41
| | | * | Merge remote-tracking branch 'upstream/master'Daniel2016-08-3123-1512/+2128
| | | |\ \
| | | * | | 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
| | * | | | fix version macro making layer 3 sticky on deadcyclo layoutBrendan Johan Lee2017-01-031-2/+2
| | * | | | Added the deadcyclo layoutBrendan Johan Lee2017-01-022-0/+283
| | * | | | ergodox: Update algernon's keymap to v1.10Gergely Nagy2016-12-283-6/+21
| | * | | | updates readmeErez Zukerman2016-12-211-1/+4
| | * | | | New default firmware graphicErez Zukerman2016-12-211-0/+0
| | * | | | Merge pull request #958 from pvinis/masterJack Humbert2016-12-181-12/+12
| | |\ \ \ \
| | | * | | | make a sysctl MO button so i can quickly use the arrowsPavlos Vinieratos2016-12-161-12/+12
| | * | | | | Adds a troubleshooting layout for resetting the EEPROMErez Zukerman2016-12-161-0/+140
| | * | | | | Removes alt/j dual functionErez Zukerman2016-12-161-6/+6
| | * | | | | Merge pull request #952 from pvinis/masterJack Humbert2016-12-151-63/+108
| | |\| | | |
| | | * | | | tap dance for some layers. one tap sysctl, two taps mouse.Pavlos Vinieratos2016-12-091-3/+29
| | | * | | | add light for some layersPavlos Vinieratos2016-12-091-0/+19
| | | * | | | separate sysctl and mouse layersPavlos Vinieratos2016-12-091-57/+57
| | | * | | | add alt keyPavlos Vinieratos2016-12-091-2/+2
| | | * | | | media keysPavlos Vinieratos2016-12-091-11/+11
| | | | |_|/ | | | |/| |
| * | | | | Increased TAPPING_TERM to 200Joshua T2017-01-061-1/+3
| * | | | | Fixed key not matching its diagramJoshua T2017-01-061-1/+1
| * | | | | 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