summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-11-10Merge branch 'master' of github.com:jackhumbert/qmk_firmwareErez Zukerman
Conflicts: keyboard/ergodox_ez/keymaps/keymap_default.c
2015-11-10Uses App key as Alt when heldErez Zukerman
2015-11-10Uses App key as Alt when heldErez Zukerman
2015-11-10[Jack & Erez] Adds standalone versions of Hyper and MehErez Zukerman
2015-11-10[Erez & Jack] Adds Meh key (Hyper without Win/Cmd)Erez Zukerman
2015-11-10Enabled NKRO by default, drops irrelevant makefile optionsErez Zukerman
2015-11-09Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert
2015-11-09Michelle's layoutJack Humbert
2015-11-07Merge pull request #36 from justinyhuang/masterJack Humbert
added support for JD45
2015-11-06minor change for the keyboard infoHuangYang
2015-11-06added support for jd45HuangYang
2015-11-05nkro infoJack Humbert
2015-10-30readmeJack Humbert
2015-10-30atomic filesJack Humbert
2015-10-30atomic up-to-dateJack Humbert
2015-10-30Fixes linkErez Zukerman
2015-10-30[Erez & Jack] Updates documentationErez Zukerman
2015-10-29readmes\!Jack Humbert
2015-10-29homebrew instructionsJack Humbert
2015-10-29Adds Hyper key, tweaks ErgoDox EZ default keymapErez Zukerman
2015-10-28READMEJack Humbert
2015-10-28Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert
2015-10-28mergingJack Humbert
2015-10-28changesJack Humbert
2015-10-27Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert
2015-10-27ht to mtJack Humbert
2015-10-27layer tap, mod tapJack Humbert
2015-10-28Fixes rolling combos for mod-tap keysErez Zukerman
2015-10-28More work on ErgoDox EZ default keymapErez Zukerman
2015-10-27toggle and hold-tap action shortcutsJack Humbert
2015-10-27updated EZ makefile with tmk_core changesJack Humbert
2015-10-28Initial working version of ErgoDox EZ layout using new syntaxErez Zukerman
2015-10-27Merge pull request #34 from jackhumbert/tmk-masterJack Humbert
merging from tmk, new_project script and template
2015-10-27new project scriptJack Humbert
2015-10-27reverting gh60Jack Humbert
2015-10-27reverting gh60Jack Humbert
2015-10-27merging tmkJack Humbert
2015-10-27README changesJack Humbert
2015-10-27Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert
2015-10-27READMEsJack Humbert
2015-10-26Merge pull request #28 from abienz/masterJack Humbert
Added volume down to function layer
2015-10-26fixed MOsJack Humbert
2015-10-26Merge pull request #32 from jackhumbert/hf/commentsJack Humbert
[Jack & Erez] Comments + tiny updates and cleanup
2015-10-26fixed makefile, added MO DF shortcutsJack Humbert
2015-10-27[Jack & Erez] Comments + tiny updates and cleanupErez Zukerman
2015-10-26ez with ledsJack Humbert
2015-10-26added ergodoxJack Humbert
2015-10-26quantum separatedJack Humbert
2015-10-25fixes for bluetooth without usbJack Humbert
2015-10-25spanish layoutJack Humbert