summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-10-283-0/+136
|\
| * [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
* | Fixing Line TerminationsIBNobody2016-10-233-472/+472
|/
* 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
* | | Contributing new keymap to ErgodoxChris McLennon2016-09-283-0/+242
|/ /
* | Disables sleep LED by defaultErez Zukerman2016-09-231-0/+2
* | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareErez Zukerman2016-09-2213-475/+616
|\ \
| * | Update the ergodox/algernon keymap to v1.7Gergely Nagy2016-09-1813-475/+616
* | | Adds EPRM reset keyErez Zukerman2016-09-222-2/+12
|/ /
* | Merge pull request #758 from absenth/developmentErez Zukerman2016-09-143-6/+9
|\ \
| * | Adding Space Cadet, And Correcting Ascii KeymapLars R. Noldan2016-09-143-6/+9
* | | Merge pull request #734 from adiabatic/masterErez Zukerman2016-09-113-10/+12
|\ \ \
| * | | - Make thumb-accessible ⌥ and ⌃ into right-⌥ and right-⌃Nathan Sharfi2016-09-072-10/+12
| * | | zweihander: rename to MakefileNathan Sharfi2016-09-071-0/+0
* | | | Merge pull request #740 from absenth/developmentErez Zukerman2016-09-113-0/+191
|\ \ \ \ | | |/ / | |/| |
| * | | Updated Image HeaderLars2016-09-081-0/+0
| * | | first commit of Absenth's Ergodox FirmwareLars2016-09-083-0/+191
* | | | Added readme.md for bepo_csaDidier Loiseau2016-09-111-0/+162
* | | | Fixed compilation issues after the mergeDidier Loiseau2016-09-111-0/+527
* | | | Merge pull request #715 from profet23/masterJack Humbert2016-09-094-0/+234
|\ \ \ \ | |/ / / |/| | |
| * | | Changing keymap name to "profet_80"profet232016-09-083-0/+0