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