summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
AgeCommit message (Expand)AuthorFilesLines
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
2016-10-23adding readmelucwastiaux1-0/+15
2016-10-22add up/down keys on thumb clusterslucwastiaux1-2/+2
2016-10-22remove brackets layer, replace a few shortcuts on thumb clusterlucwastiaux1-30/+13
2016-10-22type brackets in symbol layer, using bottom rowlucwastiaux2-8/+18
2016-10-22add tap-dance support, make right shift double-tap=caplocklucwastiaux2-1/+16
2016-10-22change include fileslucwastiaux1-1/+2
2016-10-22added dvorak programmer layoutlucwastiaux1-0/+380
2016-10-21fixed copy-cut-paste buttonstwentylives1-5/+5
2016-10-20Merge pull request #833 from h-parks/masterErez Zukerman8-0/+482
2016-10-20Merge branch 'master' of https://github.com/20lives/qmk_firmwaretwentylives1-2/+2
2016-10-20fixed base layer = keytwentylives1-1/+1
2016-10-19fix readme20lives1-2/+2
2016-10-19update pics and readmetwentylives5-133/+122
2016-10-19Win10 Writer's Block - An ErgoDox Keymaph-parks2-9/+12
2016-10-19Win10 Writer's Block - An ErgoDox Keymaph-parks8-0/+479
2016-10-18update header fileRyan Ascheman1-1/+1
2016-10-18didn't read PR comment close enough, correcting folderRyan Ascheman2-0/+0
2016-10-18moving keymap to new locationRyan Ascheman2-0/+194