summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-10-26Merge pull request #842 from priyadi/unicode_map_lengthJack Humbert2-9/+35
2016-10-26Merge pull request #841 from jacwib/masterJack Humbert3-27/+118
2016-10-26Merge pull request #831 from kejadlen/masterJack Humbert5-0/+261
2016-10-26Merge pull request #834 from kazufukurou/masterJack Humbert1-0/+82
2016-10-25[alphadox] remove tmk reset codeAlpha Chen2-10/+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 Chen5-0/+268
2016-10-231.2 updatejacwib3-20/+105
2016-10-23UNICODE_MAP: remove 5 char limit; ignore leading zeroes; handle OS limitationsPriyadi Iman Nurcahyo2-9/+35
2016-10-22Update readme to reflect 1.1 changes.jacwib1-1/+1
2016-10-22Update keymap to reflect 1.1 changes.jacwib1-9/+9
2016-10-22Update readme to reflect changesjacwib1-0/+6
2016-10-20Merge pull request #833 from h-parks/masterErez Zukerman8-0/+482
2016-10-20Merge pull request #832 from PhoenixRion/masterErez Zukerman2-0/+194
2016-10-19add programmer dvorak keymapArtyom Mironov1-0/+82
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/+0
2016-10-18Merge remote-tracking branch 'upstream/master'Ryan Ascheman6926-2418267/+105172
2016-10-18Merge pull request #829 from r2d2rogers/masterJack Humbert2-21/+22
2016-10-18Merge pull request #824 from dsvensson/pegasushoofJack Humbert11-0/+662
2016-10-18Update ez.cRob Rogers1-1/+0
2016-10-18Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareJack Humbert9-103/+189
2016-10-18removes planck/rev3 temporarilyJack Humbert1-3/+0
2016-10-18Merge pull request #826 from algernon/ergodox-ez/algernonErez Zukerman9-103/+189
2016-10-17Move hand_swap_config to ez.c, removes error for infinityRob Rogers2-20/+22
2016-10-16Update MakefileJack Humbert1-72/+1
2016-10-16Merge pull request #815 from priyadi/unicode_mapJack Humbert9-0/+495
2016-10-16Merge pull request #825 from replicaJunction/pr-vscodeJack Humbert1-0/+1
2016-10-16ergodox: Update algernon's keymap to v1.9Gergely Nagy9-103/+189
2016-10-16Added VS Code dir to .gitignoreJoshua T1-0/+1
2016-10-13Support the Pegasus Hoof controller.Daniel Svensson11-0/+662
2016-10-13Merge pull request #818 from pvinis/pvinis-keymapErez Zukerman4-0/+511
2016-10-13Merge pull request #822 from jackhumbert/hotfix/simplify_toErez Zukerman3-7/+12
2016-10-13[Jack & Erez] Simplifies and documents TOJack & Erez3-7/+12
2016-10-11add readmePavlos Vinieratos2-0/+72
2016-10-11use wait_ms instead of _delay_msPavlos Vinieratos1-7/+7
2016-10-11add messengerPavlos Vinieratos1-2/+3
2016-10-11init keymapPavlos Vinieratos2-0/+438
2016-10-11Merge pull request #803 from coderkun/coderkun_neo2Erez Zukerman1-2/+27
2016-10-11Merge pull request #809 from nathanejohnson/osx_whiskey_tango_foxtrot_capslockErez Zukerman3-0/+269
2016-10-10Merge pull request #808 from npoirey/masterJack Humbert2-0/+4
2016-10-10Merge pull request #811 from Vifon/planck_keymap_vifonJack Humbert3-0/+303
2016-10-10Merge pull request #810 from Vifon/dynamic_macrosJack Humbert2-4/+9
2016-10-10Merge pull request #814 from fredizzimo/rgb_tuningJack Humbert1-22/+33
2016-10-10Merge pull request #813 from fredizzimo/add_cluecard_rgb_effectsJack Humbert7-0/+84
2016-10-09Add example keymapPriyadi Iman Nurcahyo3-0/+444
2016-10-09Adding whiskey_tango_foxtrot_capslock ergodox keymapNathan Johnson3-0/+269