summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
AgeCommit message (Expand)AuthorFilesLines
2017-01-15Merge pull request #999 from deadcyclo/masterJack Humbert5-0/+26
2017-01-15Merge pull request #1007 from bryan4887/bryanJack Humbert1-0/+226
2017-01-14Added Bryan's keymapBryan Hernandez1-0/+226
2017-01-10Fixed incorrect layer image in deadcyclo readmeBrendan Johan Lee1-1/+1
2017-01-10Merge remote-tracking branch 'upstream/master'Brendan Johan Lee11-1/+1643
2017-01-10Added layer images to deadcyclo layout readmeBrendan Johan Lee5-0/+26
2017-01-07Merged from upstreamJoshua T86-449/+5505
2017-01-07Increased TAPPING_TERM to 200Joshua T1-1/+3
2017-01-07Fixed key not matching its diagramJoshua T1-1/+1
2017-01-06 new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-enL.pngishigoya5-3/+57
2017-01-06 new file: keyboards/ergodox/keymaps/ishigoya-jp/keymap.cishigoya1-0/+962
2017-01-05Merge pull request #983 from common-nighthawk/masterJack Humbert2-0/+222
2017-01-03fix version macro making layer 3 sticky on deadcyclo layoutBrendan Johan Lee1-2/+2
2017-01-02Added the deadcyclo layoutBrendan Johan Lee2-0/+283
2017-01-02Update config.hJack Humbert1-1/+1
2017-01-02reverts change outside of personal keymap.Daniel1-2/+1
2017-01-02adds dedicated double-quote key.Daniel1-5/+9
2016-12-28ergodox: Update algernon's keymap to v1.10Gergely Nagy3-6/+21
2016-12-22Update readme.mdErez Zukerman1-1/+1
2016-12-22Update readme.mdErez Zukerman1-5/+4
2016-12-22updates readmeErez Zukerman1-1/+4
2016-12-22New default firmware graphicErez Zukerman1-0/+0
2016-12-19Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert6-82/+269
2016-12-19rgb clean-up, api clean-upJack Humbert1-0/+1
2016-12-19Flips off MIDI and API_SYSEXErez Zukerman2-2/+2
2016-12-19Merge pull request #958 from pvinis/masterJack Humbert1-12/+12
2016-12-17Adds a troubleshooting layout for resetting the EEPROMErez Zukerman1-0/+140
2016-12-17Removes alt/j dual functionErez Zukerman1-6/+6
2016-12-16make a sysctl MO button so i can quickly use the arrowsPavlos Vinieratos1-12/+12
2016-12-15Merge pull request #952 from pvinis/masterJack Humbert1-63/+108
2016-12-15Allow power consumption to be set per-keyboard.Kyle Smith1-0/+2
2016-12-10put home/end on thumb clusterlucwastiaux1-2/+2
2016-12-10readme updateslucwastiaux1-1/+4
2016-12-10Merge remote-tracking branch 'upstream/master'lucwastiaux41-233/+1976
2016-12-10use thumb cluster key to toggle brackets layerlucwastiaux2-2/+3
2016-12-09tap dance for some layers. one tap sysctl, two taps mouse.Pavlos Vinieratos1-3/+29
2016-12-09add light for some layersPavlos Vinieratos1-0/+19
2016-12-09separate sysctl and mouse layersPavlos Vinieratos1-57/+57
2016-12-09add alt keyPavlos Vinieratos1-2/+2
2016-12-09media keysPavlos Vinieratos1-11/+11
2016-12-06removes double-tab brackets and adds back quot to left cmd.Daniel1-10/+10
2016-12-06A new default layout that supports ShineErez Zukerman2-27/+59
2016-12-06Adjusts config for better mousekey supportErez Zukerman1-3/+4
2016-12-02Tweaks Kristian's layout againErez Zukerman1-1/+1
2016-12-02Kristian's keymapErez Zukerman1-0/+79
2016-12-01Better layoutErez Zukerman1-50/+71
2016-11-29Test layout for ErgoDox EZ manufacturing robotErez Zukerman2-0/+135
2016-11-29Merge pull request #918 from jackhumbert/wu5y7Erez Zukerman13-20/+107
2016-11-29guess i didnt pullJack Humbert1-11/+0
2016-11-29Merge branch 'wu5y7' of github.com:jackhumbert/qmk_firmware into wu5y7Jack Humbert4-14/+20