summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-11-24rgblight fixesJack Humbert3-6/+8
2016-11-24travis plsJack Humbert6-52/+56
2016-11-24converted to new formatJack Humbert4-115/+206
2016-11-23converted to 8bit messagesJack Humbert3-53/+70
2016-11-22Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7Jack Humbert22-32/+1226
2016-11-22fix infinityJack Humbert2-2/+2
2016-11-22cleaning up mididJack Humbert3-51/+59
2016-11-22Merge pull request #894 from dchagniot/ergodoxDvorakEmacsJack Humbert2-0/+235
Ergodox dvorak emacs
2016-11-22Merge pull request #893 from Sihui/sh-hhkb-jpJack Humbert3-0/+147
[HHKB JP with Dvorak]
2016-11-22Merge pull request #892 from fredizzimo/disable_ergodox_lcdJack Humbert2-26/+5
Always initialize the Infinity Ergodox backlight
2016-11-22Merge pull request #891 from g-sam/galson-keymapJack Humbert3-0/+196
adds galson keymap
2016-11-22Merge pull request #890 from algernon/f/space-cadet/timeoutJack Humbert1-2/+9
Add a timeout to space-cadet shift.
2016-11-22Merge pull request #888 from climbalima/masterJack Humbert3-4/+12
Added pro micro to maxipad
2016-11-22Merge pull request #887 from profet23/atreus62Jack Humbert8-0/+622
atreus62 Keyboard Support
2016-11-22cleaning up new codeJack Humbert4-64/+73
2016-11-22merging lets_splitJack Humbert54-445/+2361
2016-11-22working with helper, qmk_helper_windows@05b0105Jack Humbert3-6/+12
2016-11-21more structure to the packageJack Humbert2-22/+100
2016-11-20add del to new cmdSihui Huang1-1/+1
2016-11-20add space to NewCmd layerSihui Huang1-1/+1
2016-11-20add space to NewCmd layerSihui Huang2-2/+2
2016-11-20typo fixDidier Chagniot2-19/+19
2016-11-20Update README.mdSihui Huang1-1/+1
2016-11-20Update README.mdSihui Huang1-1/+2
2016-11-20Update README.mdSihui Huang1-1/+2
2016-11-20add sh-hhkb-jp layersSihui Huang3-0/+145
2016-11-20Always initialze the Infinity Ergodox backlightFred Sundvik2-26/+5
Otherwise it will stay lit. The set_led functionality is also disabled since it doesn't work properly for slaves.
2016-11-19Merge pull request #878 from sethbc/add_sethbc_gh60_keymapJack Humbert5-68/+148
add sethbc keymap for gh60 and update macro expansion
2016-11-19remove KC expansion from GH60Seth Chandler4-99/+55
2016-11-19Fix the Space Cadet timeout codeGergely Nagy1-0/+4
Define a default TAPPING_TERM in quantum.c, for keyboards that do not have it set. Fixes the CI failure. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-11-19move KC expansion to separate macrosSeth Chandler4-23/+66
2016-11-19merge upstream/masterSeth Chandler49-378/+2213
2016-11-19adds galson keymapsamgalson@gmail.com3-0/+196
2016-11-19Add a timeout to space-cadet shift.Gergely Nagy1-2/+5
When one holds a Space Cadet shift, to have it act as a shift, so that mouse behaviour changes, when released without any other key pressed, it still registers a paren. To remedy this, add a hold timeout: if the key is held longer than TAPPING_TERM, it will not register the parens. Fixes #884, with the side-effect of not being able to have parens trigger the OS-side repeat anymore. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-11-19changed readmeclimbalima2-2/+3
2016-11-19added the pinout for pro micro into maxipadclimbalima2-3/+10
2016-11-19don't always detect a matrix change (fixes debounce)Jack Humbert1-1/+1
2016-11-19wqMerge branch 'wu5y7' of https://github.com/jackhumbert/qmk_firmware into wu5y7Jack Humbert5-7/+50
2016-11-19midi back and forthJack Humbert3-18/+52
2016-11-18Groundwork for dedicated color keycodesErez Zukerman3-1/+31
2016-11-18Initial Erez Experimental keymap tweaksErez Zukerman3-6/+19
2016-11-17rgb light through midiJack Humbert26-31/+126
2016-11-17Adding readme placeholderBenjamin Grabkowitz1-0/+10
2016-11-17Adding Support for atreus62 keyboard. https://github.com/profet23/atreus62Benjamin Grabkowitz7-0/+612
2016-11-17Merge pull request #883 from climbalima/masterJack Humbert25-129/+760
added rev2 lets split after merging with qmk
2016-11-17fixed readme conflictsclimbalima1-20/+2
2016-11-17should have fixed conflixedclimbalima13-268/+10
2016-11-17Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareclimbalima24-249/+1453
2016-11-17Merge https://github.com/climbalima/qmk_firmwareclimbalima14-29/+278
2016-11-17Updated my repo to current qmkclimbalima25-98/+756