jowj/jlj-qmk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,696 Commits 1 Branch 0 Tags 122 MiB
75c24499f3
Commit Graph

1696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephan Bösebeck
37e68596dd Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-28 22:29:18 +02:00
Erez Zukerman
4a43c56844 Merge pull request #216 from msc654/master 
Added msc keymap for ergodox_ez
 2016-03-28 22:40:58 +03:00
Jack Humbert
fd9e5d1510 Merge pull request #214 from cdlm/action-hook 
Add per-event user hook function
 2016-03-28 11:55:19 -04:00
Jack Humbert
5e2c497d9a Merge pull request #217 from IBNobody/master 
Master
 2016-03-28 11:51:38 -04:00
Jack Humbert
6a824df99c Merge pull request #218 from awpr/patch-1 
Add avr-libc to the Debian build dependencies.
 2016-03-28 11:49:03 -04:00
Andrew Pritchard
1fd9dbdbe9 Add avr-libc to the Debian build dependencies. 
Without avr-libc the build fails trying to #include_next a header from the standard library, which of course doesn't exist.
 2016-03-28 08:39:39 -07:00
Damien Pollet
bcebb3447c Add action-preprocessing kb/user hooks in planck 2016-03-28 16:49:47 +02:00
Damien Pollet
2181be029e Add action-preprocessing hook to keyboard template 2016-03-28 16:49:46 +02:00
Damien Pollet
acd64aa841 Rename function to be keyboard-specific 2016-03-28 16:30:00 +02:00
Damien Pollet
ef21a855e6 Add per-event user hook function to QMK 2016-03-28 16:30:00 +02:00
Matthew Carroll
a1ce133203 Corrected duplicate image issue 2016-03-28 06:00:05 -04:00
IBNobody
577971ab07 Magic Key Overrides / Keyboard Lock / Forced NKRO 
Added Magic Key Overrides / Magic Key Cleanup / Added Keyboard Lock
option to template / Added forced NKRO option to template (disabled by
default)
 2016-03-28 00:03:21 -05:00
Matthew Carroll
beda4e6fd3 Added msc keymap for ergodox_ez 2016-03-27 23:51:11 -04:00
IBNobody
b7f0110d71 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-03-27 16:17:26 -05:00
Erez Zukerman
80eefb09ac Merge pull request #188 from DidierLoiseau/issue-156 
Fix #156: clear weak mods on every key press
 2016-03-27 21:09:15 +03:00
Erez Zukerman
16da54cfa0 Merge pull request #211 from nrrkeene/master 
The Ordinary Layout is unremarkably mundane and remarkably useful
 2016-03-27 09:10:05 +03:00
Erez Zukerman
6a31d92276 Merge pull request #196 from naps62/naps62 
Adds naps62's Ergodox EZ layout
 2016-03-27 09:08:23 +03:00
Manuel Barkhau
20a3229faf Add manuneo layout 2016-03-27 02:24:35 +00:00
Nicholas Keene
e43c0c649d Merge https://github.com/jackhumbert/qmk_firmware 2016-03-26 00:44:20 -05:00
Nicholas Keene
97c4c790cc The Ordinary Layout is unremarkably mundane and remarkably useful 2016-03-26 00:40:54 -05:00
Erez Zukerman
c9aec8bc24 Merge pull request #207 from romanzolotarev/master 
Add important note about brightness on OS X
 2016-03-25 19:37:42 +03:00
IBNobody
987ee1115e Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-03-25 09:51:16 -05:00
Nicholas Keene
d7a1fc81a0 The Ordinary Layout is familiar to users of common keyboards 2016-03-24 23:10:21 -05:00
Stephan Bösebeck
94e96456b8 minor changes 2016-03-24 10:30:27 +01:00
Stephan Bösebeck
8b883c797f Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-24 08:22:21 +01:00
Jack Humbert
ba058f8b81 Merge pull request #210 from n0bs/master 
Edited Bantam44 to work with jackhumbert/qmk_firmware pull #190
 2016-03-23 13:46:02 -04:00
Norberto Monarrez
a5a40a0703 Edited to work with jackhumbert/qmk_firmware pull #190 
Basically changes "* matrix_scan_user(void)" to "matrix_scan_user(void)"
 2016-03-23 13:42:34 -04:00
Jack Humbert
95b0032142 Merge pull request #209 from n0bs/master 
Added project folder for Bantam-44
 2016-03-23 10:45:16 -04:00
Jack Humbert
02096f78e5 Merge pull request #200 from alexives/add_diagram_to_planck_layout 
Added layout diagrams to the default planck keymap
 2016-03-23 10:44:31 -04:00
Norberto Monarrez
d0c894cfae Added files for Bantam-44 2016-03-23 10:22:43 -04:00
Jack Humbert
e8951d6e41 Merge pull request #199 from IBNobody/master 
Added LED Indicator Support to QMK Template
 2016-03-22 22:15:18 -04:00
IBNobody
3d56ec052e Fixed extra semicolons. 
Fixed extra semicolons.
 2016-03-22 21:06:22 -05:00
IBNobody
10491ba21f Fixed LED Function Calls 
Fixed LED indicator function calls to match how the matrix init function
calls are formatted.
 2016-03-22 20:58:44 -05:00
IBNobody
ec62d9e85c Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 
# Conflicts:
#	quantum/template/template.c
#	quantum/template/template.h
 2016-03-22 20:39:05 -05:00
Erez Zukerman
403d756ad5 Merge pull request #190 from yoyoerx/function_pointers 
Addressing void* return warning & coding style
 2016-03-22 21:30:25 +02:00
Roman Zolotarev
3087808790 Add important note about brightness on OS X 2016-03-22 22:33:23 +08:00
Stephan Bösebeck
55fa66428c Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-22 15:00:20 +01:00
yoyoerx
baeffd99da Pull request 190 resolution with 'qmk/master' for merge 2016-03-21 17:18:53 -04:00
Erez Zukerman
7f0d77e08c Merge pull request #205 from romanzolotarev/master 
Add Roman's Layout
 2016-03-21 21:03:25 +02:00
Stephan Bösebeck
1313e0c828 fix number pad, add , 2016-03-20 23:07:38 +01:00
Stephan Bösebeck
7ebc813e82 changing cursor keys, back to "default" cursor key layout, adding ISO-cursor keys to Symb layer. Changed numbers back to symmetric layout again, keeping F-keys in symb though 2016-03-20 23:00:20 +01:00
Stephan Bösebeck
d0c62feb7e tweaking it a bit further, fixing things 2016-03-20 22:53:43 +01:00
Stephan Bösebeck
64495d11ba Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-20 22:07:53 +01:00
Erez Zukerman
e86f09d262 Merge pull request #203 from XenoBits/master 
Improved c# dev layout, only 2 layers now
 2016-03-20 22:50:56 +02:00
Erez Zukerman
ed830f2a13 Merge pull request #201 from uzytkownik/master 
Further improvements to mpiechotka keyboard
 2016-03-20 22:28:21 +02:00
Maxime Millet
cc0c157287 Fixed png image 2016-03-20 12:54:02 +01:00
Maxime Millet
895bc327c3 CSharp dev layout V2 2016-03-20 12:50:04 +01:00
Roman Zolotarev
a429374b78 Update readme 2016-03-19 17:53:58 +08:00
Roman Zolotarev
7138b1e6fc Update layout 2016-03-19 17:43:02 +08:00
Roman Zolotarev
f1c265aace Swap volup and voldown 2016-03-18 17:55:21 +08:00