summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
Commit message (Expand)AuthorAgeFilesLines
* 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-3134-1717/+2900
| |\
| * | 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
* | | Update config.hJack Humbert2017-01-021-1/+1
* | | ergodox: Update algernon's keymap to v1.10Gergely Nagy2016-12-283-6/+21
* | | Update readme.mdErez Zukerman2016-12-211-1/+1
* | | Update readme.mdErez Zukerman2016-12-211-5/+4
* | | updates readmeErez Zukerman2016-12-211-1/+4
* | | New default firmware graphicErez Zukerman2016-12-211-0/+0
* | | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert2016-12-196-82/+269
|\ \ \
| * | | Flips off MIDI and API_SYSEXErez Zukerman2016-12-192-2/+2
| * | | 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
| * | | | Allow power consumption to be set per-keyboard.Kyle Smith2016-12-141-0/+2
* | | | | rgb clean-up, api clean-upJack Humbert2016-12-191-0/+1
|/ / / /
* | | | put home/end on thumb clusterlucwastiaux2016-12-101-2/+2
* | | | readme updateslucwastiaux2016-12-101-1/+4
* | | | Merge remote-tracking branch 'upstream/master'lucwastiaux2016-12-1041-233/+1976
|\| | |
| * | | A new default layout that supports ShineErez Zukerman2016-12-052-27/+59
| * | | Adjusts config for better mousekey supportErez Zukerman2016-12-051-3/+4
| * | | Tweaks Kristian's layout againErez Zukerman2016-12-021-1/+1
| * | | Kristian's keymapErez Zukerman2016-12-021-0/+79
| * | | Better layoutErez Zukerman2016-11-301-50/+71
| * | | Test layout for ErgoDox EZ manufacturing robotErez Zukerman2016-11-292-0/+135
| * | | Merge pull request #918 from jackhumbert/wu5y7Erez Zukerman2016-11-2913-20/+107
| |\ \ \
| | * | | guess i didnt pullJack Humbert2016-11-291-11/+0
| | * | | Merge branch 'wu5y7' of github.com:jackhumbert/qmk_firmware into wu5y7Jack Humbert2016-11-294-14/+20
| | |\ \ \