summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-02-07Merge pull request #1046 from LukeSilva/masterJack Humbert
Add Tapping Macros to QMK
2017-02-07Merge pull request #1057 from priyadi/selectable_outputJack Humbert
Implement runtime selectable output (USB or BT)
2017-02-07pass through travis errorsJack Humbert
2017-02-07Merge pull request #1056 from upils/masterJack Humbert
Add reddot handwired keyboard.
2017-02-07Merge pull request #1053 from TerryMathews/masterJack Humbert
Let's Split: establish rev2fliphalf subproject
2017-02-07variable scope fix for travisJack Humbert
2017-02-07correctly assign bash variableJack Humbert
2017-02-07fix typoJack Humbert
2017-02-07add commaJack Humbert
2017-02-07Merge pull request #1069 from hot-leaf-juice/masterJack Humbert
change cmd-l and cmd-r for actual home and end
2017-02-07try building only keyboards neededJack Humbert
2017-02-07Merge pull request #1041 from folkert4/masterJack Humbert
Added Espynn's keymap
2017-02-07Merge pull request #1047 from lordchair/keymap_yaleJack Humbert
yale planck layout
2017-02-06Merge pull request #1048 from smt/smt/planckJack Humbert
Add smt's keymap for Planck
2017-02-06Merge pull request #1059 from qmk/hf/algr_tJack Humbert
Introduces ALGR_T for dual-function AltGr
2017-02-06Merge pull request #1036 from nicinabox/lets-split-improvementsJack Humbert
Lets Split flashing improvements
2017-02-06Merge pull request #960 from ofples/feature/combosJack Humbert
Keyboard combination triggers
2017-02-06Reverse rev2 and rev2fliphalfTerryMathews
Flipped definitions on what constitutes "fliphalf" by popular demand.
2017-02-06Revert "Reverse rev2 and rev2fliphalf"TerryMathews
This reverts commit 0537977ba1412aa2ba753e152eec445e18858244.
2017-02-06Reverse rev2 and rev2fliphalfTerryMathews
Flipped definitions on what constitutes "fliphalf" by popular demand.
2017-02-06Merge pull request #1010 from SjB/oneshot_timeout_fixJack Humbert
oneshot timeout would only timeout after an event.
2017-02-06Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert
2017-02-06[skip build] testing travis scriptJack Humbert
2017-02-06Merge pull request #981 from jonasoberschweiber/osx-surrogate-pairsJack Humbert
Add support for Unicode supplementary planes on OS X
2017-02-06[skip build] testing travis scriptJack Humbert
2017-02-06Merge pull request #1030 from SjB/refactor_register_code16Jack Humbert
speeding up (un)register_code16
2017-02-06[skip build] testing travis scriptJack Humbert
2017-02-06[skip build] testing travis scriptJack Humbert
2017-02-06[skip build] testing travis scriptJack Humbert
2017-02-06[skip build] testing travis scriptJack Humbert
2017-02-06[skip build] testing travis scriptJack Humbert
2017-02-06fixes qmk.fm linking, tests out auto version incrementingJack Humbert
2017-02-06change cmd-l and cmd-r for actual home and endCallum Oakley
2017-02-02Merge pull request #1063 from osamuaoki/masterErez Zukerman
Typo fixes
2017-02-02Merge pull request #1058 from edasque/masterErez Zukerman
Reverted Dockerfile to put the CMD back
2017-02-02Typo fixesOsamu Aoki
2017-02-01Merge pull request #1049 from SjB/tap_dance_save_oneshot_modsErez Zukerman
race condition between oneshot_mods and tap_dance
2017-02-01Merge pull request #1054 from deadcyclo/masterErez Zukerman
Adds support for ergodox shine and unicode and emoji support to the deadcyclo layout
2017-02-01Restrict outputselect to LUFA only for nowPriyadi Iman Nurcahyo
2017-02-01Fix wrong includePriyadi Iman Nurcahyo
2017-02-01Limit outputselect to AVR only for nowPriyadi Iman Nurcahyo
2017-02-01Move outputselect to parent dir to satisfy non LUFA keyboardsPriyadi Iman Nurcahyo
2017-02-01Add layer switcher keycodes: OUT_AUTO, OUT_USB, OUT_BT, OUT_BLEPriyadi Iman Nurcahyo
2017-02-01Merge remote-tracking branch 'upstream/master'Brendan Johan Lee
2017-01-31Introduces ALGR_T for dual-function AltGrErez Zukerman
2017-01-31Reverted Dockerfile to put the CMD backErik Dasque
2017-01-31Merge pull request #1039 from zabereer/albert_ergodox_keymapErez Zukerman
albert ergodox keymap
2017-01-31Merge pull request #1055 from matzebond/masterErez Zukerman
update my neo2 keymap
2017-02-01Implement runtime selectable output (USB or BT)Priyadi Iman Nurcahyo
2017-01-31Add reddot handwired keyboard.upils