summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
AgeCommit message (Expand)AuthorFilesLines
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
2016-11-29enable rgblight by default for ezJack Humbert2-0/+12
2016-11-29enable api sysex for ezJack Humbert1-0/+1
2016-11-28Add the AZERTY compatibility layer.Olivier2-7/+122
2016-11-28Change layer names (cosmetic change) and reorder them so that the "shift" lay...Olivier1-62/+62
2016-11-28Tweaks position of TOG not to conflict with MOErez Zukerman1-3/+3
2016-11-28A little cleanup, add some comments, change others.Olivier1-26/+16
2016-11-28Tweaks EZ MakefileErez Zukerman1-1/+6
2016-11-28Pulls LED config into common config for EZErez Zukerman2-10/+11
2016-11-28Adjust comment.Olivier1-1/+1
2016-11-28Reorganize the numeric keypad layer more like a traditional numeric keypad.Olivier2-12/+12
2016-11-27Merge https://github.com/jackhumbert/qmk_firmwareOlivier106-1293/+7349
2016-11-26separated into api files/folderJack Humbert2-2/+1
2016-11-24rgblight fixesJack Humbert2-5/+7
2016-11-24travis plsJack Humbert2-2/+4
2016-11-22Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7Jack Humbert7-26/+436
2016-11-22fix infinityJack Humbert2-2/+2
2016-11-22Merge pull request #894 from dchagniot/ergodoxDvorakEmacsJack Humbert2-0/+235
2016-11-22Merge pull request #892 from fredizzimo/disable_ergodox_lcdJack Humbert2-26/+5
2016-11-22merging lets_splitJack Humbert11-13/+925
2016-11-20typo fixDidier Chagniot2-19/+19
2016-11-20Always initialze the Infinity Ergodox backlightFred Sundvik2-26/+5
2016-11-19adds galson keymapsamgalson@gmail.com3-0/+196
2016-11-19wqMerge branch 'wu5y7' of https://github.com/jackhumbert/qmk_firmware into wu5y7Jack Humbert3-7/+42
2016-11-19midi back and forthJack Humbert1-1/+6
2016-11-18Groundwork for dedicated color keycodesErez Zukerman1-1/+23
2016-11-18Initial Erez Experimental keymap tweaksErez Zukerman3-6/+19
2016-11-17rgb light through midiJack Humbert1-1/+2
2016-11-16dvorak/plover keyboard layoutSeebs2-0/+244
2016-11-16Merge pull request #880 from psyill/masterJack Humbert6-0/+678
2016-11-14mostly workingJack Humbert4-4/+13
2016-11-13Added keymap "videck", an ErgoDox keymap for Vi(m) users.Hans EllegÄrd6-0/+678
2016-11-13update sethbc ergodox keymapSeth Chandler3-13/+3
2016-11-13mergingJack Humbert45-149/+2511
2016-11-06Removed the control action when holding z or /Jonathan Arnett1-3/+3
2016-11-01Implements dedicated text zoom keysErez Zukerman2-3/+7
2016-11-01Merge pull request #851 from J3RN/momentaryErez Zukerman1-5/+5
2016-11-01Merge pull request #843 from lucwastiaux/masterErez Zukerman3-0/+426
2016-11-01Merge pull request #836 from 20lives/masterErez Zukerman7-472/+695
2016-10-26re-introduce brackets layerlucwastiaux1-2/+24
2016-10-25[alphadox] remove tmk reset codeAlpha Chen1-5/+0
2016-10-25[ergodox][alphadox] undefine tapping_term, ignore_mod_tap_interruptAlpha Chen1-0/+3
2016-10-25add alphadox layouts to atreus and ergodoxAlpha Chen3-0/+138
2016-10-23merge upstreamLior Haim12-21/+698