summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox/keymaps
Commit message (Expand)AuthorAgeFilesLines
* Reduced TAPPING_TERM to 150Joshua T2016-10-151-4/+2
* Merge remote-tracking branch 'upstream/master'Joshua T2016-10-1553-994/+3791
|\
| * 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-0241-920/+2863
| | |\
| | * | 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-302-36/+55
| |\ \
| | * | Added description of kastyle keymapchwilk2016-09-271-0/+14
| | * | Moved hand_swap_config array so all keyboards get it definedchwilk2016-09-261-21/+0
| | * | Updated kastyle keymap, including swap hands featurechwilk2016-09-261-36/+62
| * | | Remove config.hChris McLennon2016-09-281-93/+0
| * | | Contributing new keymap to ErgodoxChris McLennon2016-09-283-0/+242
| |/ /
| * | 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
| |/ / /
| * / / Fix typoRoman Zolotarev2016-09-081-1/+1
| |/ /
| * | Merge pull request #732 from romanzolotarev/masterErez Zukerman2016-09-062-27/+40
| |\ \
| | * | Change CTL_T(KC_ESC) to KC_LCTRL and update readmeRoman Zolotarev2016-09-072-27/+40
| * | | norwegian programmer-friendly layoutjoar2016-09-066-0/+420
| |/ /
| * | Merge pull request #728 from fitzsim/yoruianErez Zukerman2016-09-066-0/+277
| |\ \
| | * | Fix ergodox_yoruian XKB namingThomas Fitzsimmons2016-09-062-2/+2
| | * | Add new ErgoDox EZ keymap, YORUIANThomas Fitzsimmons2016-09-056-0/+277
| * | | Merge pull request #686 from coderkun/coderkun_neo2Erez Zukerman2016-09-052-7/+19
| |\ \ \ | | | |/ | | |/|
| | * | Add box-drawing Unicode characters to keymap “coderkun_neo2”coderkun2016-08-261-6/+6
| | * | Set Unicode input mode and override unicode_input_start() method to keymap ...coderkun2016-08-261-2/+14
| | * | Disable debugging for Ergodox keymap “coderkun_neo2”coderkun2016-08-262-1/+1
| | |/
| * / ergodox: Update algernon's keymap to v1.6Gergely Nagy2016-08-248-523/+552
| |/
* | Merge remote-tracking branch 'upstream/master'Joshua T2016-08-2423-1512/+2128
|\|
| * Merge pull request #665 from linsomniac/keymap_jafoJack Humbert2016-08-205-0/+213
| |\
| | * Bringing over changes from default map.Sean Reifschneider2016-08-191-4/+3
| | * Adding jafo layout.Sean Reifschneider2016-08-195-0/+214
| * | Merge pull request #658 from Xyverz/masterJack Humbert2016-08-202-209/+211
| |\ \