summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-02-04Fix compile warnings in light_ws2812.cNikolaus Wittenstein1-3/+3
2017-02-03Merge pull request #1063 from osamuaoki/masterErez Zukerman1-18/+18
2017-02-03Merge pull request #1058 from edasque/masterErez Zukerman1-1/+2
2017-02-02Typo fixesOsamu Aoki1-18/+18
2017-02-02Merge pull request #1049 from SjB/tap_dance_save_oneshot_modsErez Zukerman2-1/+7
2017-02-02Merge pull request #1054 from deadcyclo/masterErez Zukerman7-103/+384
2017-02-01Merge remote-tracking branch 'upstream/master'Brendan Johan Lee5-30/+900
2017-02-01Reverted Dockerfile to put the CMD backErik Dasque1-1/+2
2017-02-01Merge pull request #1039 from zabereer/albert_ergodox_keymapErez Zukerman4-0/+866
2017-02-01Merge pull request #1055 from matzebond/masterErez Zukerman1-30/+34
2017-01-30update my neo2 keymapMatthias Schmitt1-30/+34
2017-01-30[deadcyclo layout] Refactoring. Use custom functions and macrosBrendan Johan Lee1-237/+266
2017-01-30[deadcyclo layout] fixed failing testsBrendan Johan Lee1-16/+1
2017-01-30Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2-2/+18
2017-01-29race condition between oneshot_mods and tap_danceSjB2-1/+7
2017-01-28Merge pull request #1043 from potz/patch-1skullydazed1-0/+16
2017-01-27Clarify license on abnt2 keymap (#1038)Potiguar Faga1-0/+16
2017-01-27Merge pull request #869 from dylanjgscott/masterJack Humbert1-2/+2
2017-01-27Merge remote-tracking branch 'upstream/master'Brendan Johan Lee16-22/+22
2017-01-27[deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keysBrendan Johan Lee4-23/+26
2017-01-27Merge pull request #1035 from qmk/qmk_org_changesJack Humbert16-22/+22
2017-01-26albert ergodox keymapAlbert Pretorius4-0/+866
2017-01-26Merge remote-tracking branch 'upstream/master'Brendan Johan Lee11-16/+403
2017-01-26replace jackhumbert with qmkJack Humbert16-22/+22
2017-01-26Merge pull request #1029 from SjB/qmk_infinity60Jack Humbert5-0/+46
2017-01-26Merge pull request #1033 from smt/smt/preonicJack Humbert3-0/+335
2017-01-26Add gitter image, start update to qmk orgJack Humbert1-3/+3
2017-01-25Remove COLEMAK from preonic_keycodes enumStephen Tudor1-1/+0
2017-01-25Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert3-3/+66
2017-01-25layer defines to enumJack Humbert2-13/+19
2017-01-25[deadcyclo layout] Added lotsof new emojis and some new unicode keysBrendan Johan Lee3-11/+178
2017-01-25Update readme for smt Preonic keymapStephen Tudor1-1/+85
2017-01-25Add smt keymap for PreonicStephen Tudor3-0/+252
2017-01-24Merge remote-tracking branch 'upstream/master'Brendan Johan Lee6-8/+72
2017-01-24[deadcyclo layout] Added unicode layerBrendan Johan Lee5-27/+98
2017-01-24[deadcyclo layout] Added support for ergodox ez shineBrendan Johan Lee4-14/+40
2017-01-24Merge pull request #1014 from SjB/lcd_mods_statusJack Humbert3-3/+66
2017-01-24updated all the other keymaps to support the new changes.SjB3-0/+28
2017-01-24fix: infinity60 keyboard was not using quantum features.SjB2-0/+18
2017-01-24Compare Makefile with itself instead of using `--help`Dylan Scott1-2/+2
2017-01-23turn off rgb_midi in ezJack Humbert3-5/+6
2017-01-23Merge pull request #1026 from TerryMathews/masterJack Humbert2-23/+0
2017-01-23More code cleanupTerryMathews2-23/+0
2017-01-23Merge pull request #1018 from hot-leaf-juice/masterJack Humbert2-44/+19
2017-01-23More keyboard map tweaking (#1019)Christopher Browne2-6/+6
2017-01-23Merge pull request #1020 from remigius42/masterJack Humbert6-0/+1157
2017-01-23Merge pull request #1022 from lucwastiaux/masterJack Humbert2-13/+48
2017-01-23Merge pull request #1021 from luizribeiro/ps2avrGBJack Humbert19-18/+877
2017-01-23Merge pull request #1023 from TerryMathews/masterJack Humbert7-400/+23
2017-01-22Missed commenting out notes at end of lineTerryMathews2-2/+2