summaryrefslogtreecommitdiff
path: root/keyboards/ergodox
AgeCommit message (Expand)Author
2017-01-15Merge pull request #999 from deadcyclo/masterJack Humbert
2017-01-15Merge pull request #1007 from bryan4887/bryanJack Humbert
2017-01-13Added Bryan's keymapBryan Hernandez
2017-01-10Fixed incorrect layer image in deadcyclo readmeBrendan Johan Lee
2017-01-10Merge remote-tracking branch 'upstream/master'Brendan Johan Lee
2017-01-10Added layer images to deadcyclo layout readmeBrendan Johan Lee
2017-01-07Merged from upstreamJoshua T
2017-01-06Increased TAPPING_TERM to 200Joshua T
2017-01-06Fixed key not matching its diagramJoshua T
2017-01-06 new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-enL.pngishigoya
2017-01-06 new file: keyboards/ergodox/keymaps/ishigoya-jp/keymap.cishigoya
2017-01-04Merge pull request #983 from common-nighthawk/masterJack Humbert
2017-01-03fix version macro making layer 3 sticky on deadcyclo layoutBrendan Johan Lee
2017-01-02Added the deadcyclo layoutBrendan Johan Lee
2017-01-02Update config.hJack Humbert
2017-01-01reverts change outside of personal keymap.Daniel
2017-01-01adds dedicated double-quote key.Daniel
2016-12-28ergodox: Update algernon's keymap to v1.10Gergely Nagy
2016-12-21Update readme.mdErez Zukerman
2016-12-21Update readme.mdErez Zukerman
2016-12-21updates readmeErez Zukerman
2016-12-21New default firmware graphicErez Zukerman
2016-12-19Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert
2016-12-19rgb clean-up, api clean-upJack Humbert
2016-12-19Flips off MIDI and API_SYSEXErez Zukerman
2016-12-18Merge pull request #958 from pvinis/masterJack Humbert
2016-12-16Adds a troubleshooting layout for resetting the EEPROMErez Zukerman
2016-12-16Removes alt/j dual functionErez Zukerman
2016-12-16make a sysctl MO button so i can quickly use the arrowsPavlos Vinieratos
2016-12-15Merge pull request #952 from pvinis/masterJack Humbert
2016-12-14Allow power consumption to be set per-keyboard.Kyle Smith
2016-12-10put home/end on thumb clusterlucwastiaux
2016-12-10readme updateslucwastiaux
2016-12-10Merge remote-tracking branch 'upstream/master'lucwastiaux
2016-12-10use thumb cluster key to toggle brackets layerlucwastiaux
2016-12-09tap dance for some layers. one tap sysctl, two taps mouse.Pavlos Vinieratos
2016-12-09add light for some layersPavlos Vinieratos
2016-12-09separate sysctl and mouse layersPavlos Vinieratos
2016-12-09add alt keyPavlos Vinieratos
2016-12-09media keysPavlos Vinieratos
2016-12-06removes double-tab brackets and adds back quot to left cmd.Daniel
2016-12-05A new default layout that supports ShineErez Zukerman
2016-12-05Adjusts config for better mousekey supportErez Zukerman
2016-12-02Tweaks Kristian's layout againErez Zukerman
2016-12-02Kristian's keymapErez Zukerman
2016-11-30Better layoutErez Zukerman
2016-11-29Test layout for ErgoDox EZ manufacturing robotErez Zukerman
2016-11-29Merge pull request #918 from jackhumbert/wu5y7Erez Zukerman
2016-11-29guess i didnt pullJack Humbert
2016-11-29Merge branch 'wu5y7' of github.com:jackhumbert/qmk_firmware into wu5y7Jack Humbert