aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
Commit message (Expand)AuthorAgeFilesLines
* 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
* | ergodox: Update algernon's keymap to v1.9Gergely Nagy2016-10-169-103/+189
|/
* Merge pull request #818 from pvinis/pvinis-keymapErez Zukerman2016-10-134-0/+511
|\
| * add readmePavlos Vinieratos2016-10-112-0/+72
| * use wait_ms instead of _delay_msPavlos Vinieratos2016-10-111-7/+7
| * add messengerPavlos Vinieratos2016-10-111-2/+3
| * init keymapPavlos Vinieratos2016-10-112-0/+438
* | [Jack & Erez] Simplifies and documents TOJack & Erez2016-10-121-6/+6
|/
* Merge pull request #803 from coderkun/coderkun_neo2Erez Zukerman2016-10-101-2/+27
|\
| * Overwrite method hex_to_unicode() for make it compatible with Neocoderkun2016-10-031-0/+25
| * Merge branch 'master' into coderkun_neo2coderkun2016-10-0253-1125/+3453
| |\
| * | Add double arrow Unicode characters to FMU layercoderkun2016-10-021-2/+2
* | | Adding whiskey_tango_foxtrot_capslock ergodox keymapNathan Johnson2016-10-093-0/+269
* | | ergodox: Update algernon's keymap to v1.8Gergely Nagy2016-10-039-175/+212
| |/ |/|
* | Merge pull request #788 from chwilk/kastyle-refreshErez Zukerman2016-09-304-36/+80
|\ \
| * | Added description of kastyle keymapchwilk2016-09-271-0/+14
| * | Moved hand_swap_config array so all keyboards get it definedchwilk2016-09-262-21/+24
| * | Updated kastyle keymap, including swap hands featurechwilk2016-09-261-36/+62
| * | Added ONEHAND_ENABLE to allow SWAP HANDS actionschwilk2016-09-261-0/+1
* | | Remove config.hChris McLennon2016-09-281-93/+0