Commit Graph

1158 Commits (ea44ac4a622329f719ff82497fb47c9d3f623364)
 

Author SHA1 Message Date
Erez Zukerman ea44ac4a62 Merge branch 'master' of github.com:jackhumbert/qmk_firmware
Conflicts:
	keyboard/ergodox_ez/keymaps/keymap_default.c
9 years ago
Erez Zukerman 926ce2262f Uses App key as Alt when held 9 years ago
Erez Zukerman 24cb218de0 Uses App key as Alt when held 9 years ago
Erez Zukerman 407f41cd9a [Jack & Erez] Adds standalone versions of Hyper and Meh 9 years ago
Erez Zukerman f5ec585ed8 [Erez & Jack] Adds Meh key (Hyper without Win/Cmd) 9 years ago
Erez Zukerman 80397187cd Enabled NKRO by default, drops irrelevant makefile options 9 years ago
Jack Humbert 3d1117db50 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 9 years ago
Jack Humbert 8e9153ce12 Michelle's layout 9 years ago
Jack Humbert d2d75b9759 Merge pull request #36 from justinyhuang/master
added support for JD45
9 years ago
HuangYang 6ec6279d82 minor change for the keyboard info 9 years ago
HuangYang 765f8a2aef added support for jd45 9 years ago
Jack Humbert 6485c7d7da nkro info 9 years ago
Jack Humbert 3511a830ac readme 9 years ago
Jack Humbert 5901f5911b atomic files 9 years ago
Jack Humbert eb2795b4d6 atomic up-to-date 9 years ago
Erez Zukerman 3ac4f1519f Fixes link 9 years ago
Erez Zukerman 04a36ecbf4 [Erez & Jack] Updates documentation 9 years ago
Jack Humbert 93812e52b5 readmes\! 9 years ago
Jack Humbert 39915b1748 homebrew instructions 9 years ago
Erez Zukerman 4b0c54324a Adds Hyper key, tweaks ErgoDox EZ default keymap 9 years ago
Jack Humbert ea0e1169e6 README 9 years ago
Jack Humbert e3050bba67 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 9 years ago
Jack Humbert 8643e01286 merging 9 years ago
Jack Humbert 1fb8b4ce3a changes 9 years ago
Jack Humbert b8ebba012b Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 9 years ago
Jack Humbert dee171b425 ht to mt 9 years ago
Jack Humbert 18da1e6801 layer tap, mod tap 9 years ago
Erez Zukerman f024a462cd Fixes rolling combos for mod-tap keys 9 years ago
Erez Zukerman d3db8d62f6 More work on ErgoDox EZ default keymap 9 years ago
Jack Humbert d9f08e6177 toggle and hold-tap action shortcuts 9 years ago
Jack Humbert 909d30553f updated EZ makefile with tmk_core changes 9 years ago
Erez Zukerman 2739aa8d78 Initial working version of ErgoDox EZ layout using new syntax 9 years ago
Jack Humbert d311fd8d1a Merge pull request #34 from jackhumbert/tmk-master
merging from tmk, new_project script and template
9 years ago
Jack Humbert 6f3141965e new project script 9 years ago
Jack Humbert d35402938f reverting gh60 9 years ago
Jack Humbert 0e93ee235f reverting gh60 9 years ago
Jack Humbert 547da78335 merging tmk 9 years ago
Jack Humbert a766918d5c README changes 9 years ago
Jack Humbert 53f7c6535d Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 9 years ago
Jack Humbert 5a268d97ec READMEs 9 years ago
Jack Humbert 018e7a2e37 Merge pull request #28 from abienz/master
Added volume down to function layer
9 years ago
Jack Humbert a6913550c8 fixed MOs 9 years ago
Jack Humbert 7f8643a6a6 Merge pull request #32 from jackhumbert/hf/comments
[Jack & Erez] Comments + tiny updates and cleanup
9 years ago
Jack Humbert cc1c32671e fixed makefile, added MO DF shortcuts 9 years ago
Erez Zukerman 0c47e8b008 [Jack & Erez] Comments + tiny updates and cleanup 9 years ago
Jack Humbert 402122744c ez with leds 9 years ago
Jack Humbert 35a81f5b8b added ergodox 9 years ago
Jack Humbert 46e7fb2d3c quantum separated 9 years ago
Jack Humbert ff8d8a50df fixes for bluetooth without usb 9 years ago
Jack Humbert 61fea81a24 spanish layout 9 years ago