summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
Commit message (Expand)AuthorAgeFilesLines
* A little cleanup, add some comments, change others.Olivier2016-11-281-26/+16
* Adjust comment.Olivier2016-11-281-1/+1
* Reorganize the numeric keypad layer more like a traditional numeric keypad.Olivier2016-11-282-12/+12
* Merge https://github.com/jackhumbert/qmk_firmwareOlivier2016-11-27106-1293/+7349
|\
| * Merge pull request #894 from dchagniot/ergodoxDvorakEmacsJack Humbert2016-11-212-0/+235
| |\
| | * typo fixDidier Chagniot2016-11-202-19/+19
| | * readme.md updatedDidier Chagniot2016-09-101-0/+70
| | * typing with itDidier Chagniot2016-09-091-0/+165
| * | Merge pull request #892 from fredizzimo/disable_ergodox_lcdJack Humbert2016-11-212-26/+5
| |\ \
| | * | Always initialze the Infinity Ergodox backlightFred Sundvik2016-11-202-26/+5
| * | | adds galson keymapsamgalson@gmail.com2016-11-193-0/+196
| |/ /
| * | dvorak/plover keyboard layoutSeebs2016-11-162-0/+244
| * | Merge pull request #880 from psyill/masterJack Humbert2016-11-166-0/+678
| |\ \
| | * | Added keymap "videck", an ErgoDox keymap for Vi(m) users.Hans EllegÄrd2016-11-136-0/+678
| * | | update sethbc ergodox keymapSeth Chandler2016-11-133-13/+3
| |/ /
| * | Removed the control action when holding z or /Jonathan Arnett2016-11-061-3/+3
| * | Implements dedicated text zoom keysErez Zukerman2016-11-012-3/+7
| * | Merge pull request #851 from J3RN/momentaryErez Zukerman2016-10-311-5/+5
| |\ \
| | * | Switched to momentaryJonathan Arnett2016-10-091-5/+5
| * | | Merge pull request #843 from lucwastiaux/masterErez Zukerman2016-10-313-0/+426
| |\ \ \
| | * | | re-introduce brackets layerlucwastiaux2016-10-261-2/+24
| | * | | adding readmelucwastiaux2016-10-231-0/+15
| | * | | add up/down keys on thumb clusterslucwastiaux2016-10-231-2/+2
| | * | | remove brackets layer, replace a few shortcuts on thumb clusterlucwastiaux2016-10-231-30/+13
| | * | | type brackets in symbol layer, using bottom rowlucwastiaux2016-10-232-8/+18
| | * | | add tap-dance support, make right shift double-tap=caplocklucwastiaux2016-10-222-1/+16
| | * | | change include fileslucwastiaux2016-10-221-1/+2
| | * | | added dvorak programmer layoutlucwastiaux2016-10-221-0/+380
| * | | | Merge pull request #836 from 20lives/masterErez Zukerman2016-10-317-472/+695
| |\ \ \ \
| | * | | | merge upstreamLior Haim2016-10-2312-21/+698
| | |\| | |
| | * | | | fixed copy-cut-paste buttonstwentylives2016-10-211-5/+5
| | * | | | Merge branch 'master' of https://github.com/20lives/qmk_firmwaretwentylives2016-10-201-2/+2
| | |\ \ \ \
| | | * | | | fix readme20lives2016-10-191-2/+2
| | * | | | | fixed base layer = keytwentylives2016-10-201-1/+1
| | |/ / / /
| | * | | | update pics and readmetwentylives2016-10-195-133/+122
| | * | | | Update readme.md20lives2016-10-181-3/+5
| | * | | | Update readme.md20lives2016-10-181-1/+3
| | * | | | adding dvorak hebrew layouttwentylives2016-10-183-0/+230
| * | | | | [alphadox] remove tmk reset codeAlpha Chen2016-10-251-5/+0
| * | | | | [ergodox][alphadox] undefine tapping_term, ignore_mod_tap_interruptAlpha Chen2016-10-251-0/+3
| * | | | | add alphadox layouts to atreus and ergodoxAlpha Chen2016-10-253-0/+138
| | |/ / / | |/| | |
| * | | | Merge pull request #833 from h-parks/masterErez Zukerman2016-10-208-0/+482
| |\ \ \ \
| | * | | | Win10 Writer's Block - An ErgoDox Keymaph-parks2016-10-192-9/+12
| | * | | | Win10 Writer's Block - An ErgoDox Keymaph-parks2016-10-188-0/+479
| * | | | | update header fileRyan Ascheman2016-10-181-1/+1
| * | | | | didn't read PR comment close enough, correcting folderRyan Ascheman2016-10-182-0/+0
| * | | | | moving keymap to new locationRyan Ascheman2016-10-182-0/+194
| |/ / / /
| * | | | Merge pull request #829 from r2d2rogers/masterJack Humbert2016-10-182-21/+22
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Update ez.cRob Rogers2016-10-181-1/+0
| | * | | Move hand_swap_config to ez.c, removes error for infinityRob Rogers2016-10-172-20/+22