summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-02-07Merge pull request #1010 from SjB/oneshot_timeout_fixJack Humbert1-8/+8
2017-02-07Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert1-1/+10
2017-02-07[skip build] testing travis scriptJack Humbert1-1/+1
2017-02-07Merge pull request #981 from jonasoberschweiber/osx-surrogate-pairsJack Humbert1-1/+10
2017-02-06[skip build] testing travis scriptJack Humbert2-1/+3
2017-02-06Added non-animated gradient modedungdung2-1/+20
2017-02-06Added mode reverse step functiondungdung2-0/+9
2017-02-06Christmas mode now works with even RGBED_NUMdungdung2-4/+12
2017-02-06Merge pull request #1030 from SjB/refactor_register_code16Jack Humbert1-2/+30
2017-02-06[skip build] testing travis scriptJack Humbert1-1/+1
2017-02-06[skip build] testing travis scriptJack Humbert1-1/+5
2017-02-06[skip build] testing travis scriptJack Humbert1-1/+1
2017-02-06[skip build] testing travis scriptJack Humbert1-3/+1
2017-02-06[skip build] testing travis scriptJack Humbert2-19/+25
2017-02-06fixes qmk.fm linking, tests out auto version incrementingJack Humbert1-1/+20
2017-02-06change cmd-l and cmd-r for actual home and endCallum Oakley2-5/+3
2017-02-06Minor cleanupNikolaus Wittenstein3-8/+2
2017-02-06Add new DIODE_DIRECTION optionNikolaus Wittenstein3-8/+12
2017-02-06Remove unused matrix_raw variable in matrix.cNikolaus Wittenstein1-2/+0
2017-02-05Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwaremilestogo121-750/+6291
2017-02-04Add missing header to ergodox ordinary keymapNikolaus Wittenstein1-0/+1
2017-02-04Fix compile warnings in egodox robot_test_layoutNikolaus Wittenstein1-4/+4
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-02Fix V-USB bug on Windows 10Luiz Ribeiro1-2/+2
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-01Restrict outputselect to LUFA only for nowPriyadi Iman Nurcahyo1-2/+2
2017-02-01Fix wrong includePriyadi Iman Nurcahyo1-1/+1
2017-02-01Limit outputselect to AVR only for nowPriyadi Iman Nurcahyo5-3/+6
2017-02-01Move outputselect to parent dir to satisfy non LUFA keyboardsPriyadi Iman Nurcahyo2-0/+0
2017-02-01Add layer switcher keycodes: OUT_AUTO, OUT_USB, OUT_BT, OUT_BLEPriyadi Iman Nurcahyo2-0/+39
2017-02-01Merge remote-tracking branch 'upstream/master'Brendan Johan Lee5-30/+900
2017-02-01Introduces ALGR_T for dual-function AltGrErez Zukerman1-0/+1
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-31Implement runtime selectable output (USB or BT)Priyadi Iman Nurcahyo4-69/+145
2017-01-31Add reddot handwired keyboard.upils8-0/+334
2017-01-31fixing kinesis rebootmilestogo1-2/+2
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-30Let's Split: establish rev2fliphalf subprojectTerryMathews9-0/+171
2017-01-29race condition between oneshot_mods and tap_danceSjB2-1/+7
2017-01-29moved oneshot cancellation code outside of process_record.SjB1-8/+8
2017-01-29registering a weak_mods when using register_code16SjB1-4/+24