summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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-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-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-01-30update my neo2 keymapMatthias Schmitt
2017-01-30[deadcyclo layout] Refactoring. Use custom functions and macrosBrendan Johan Lee
2017-01-30[deadcyclo layout] fixed failing testsBrendan Johan Lee
2017-01-30Merge remote-tracking branch 'upstream/master'Brendan Johan Lee
2017-01-29race condition between oneshot_mods and tap_danceSjB
since the keycode for a tap dance process gets process only after the TAPPING_TERM timeout, you really only have ONESHOT_TIMEOUT - TAPPING_TERM time to tap or double tap on the key. This fix save the oneshot_mods into the action.state structure and applies the mods with the keycode when it's registered. It also unregisters the mod when the the tap dance process gets reset.
2017-01-29moved oneshot cancellation code outside of process_record.SjB
The oneshot cancellation code do not depend on the action_tapping_process and since process_record get called via the action_tapping_process logic moved the oneshot cancellation code into the action_exec function just before the action_tapping_process call
2017-01-29registering a weak_mods when using register_code16SjB
Scenario: Locking the KC_LSHIFT, and then using a tap dance key that registers a S(KC_9) will unregister the KC_LSHIFT. The tap dance or any keycode that is registered should not have the side effect of cancelling a locked moditifier. We should be using a similar logic as the TMK codes in tmk_core/comman/action.c:158.
2017-01-28s/Bkps/BkspStephen Tudor
2017-01-28Carry over Planck updates to my Preonic keymapStephen Tudor
2017-01-28Improve Planck keymapStephen Tudor
- added escape+shift mod-tap key - replaced BRITE with backtick
2017-01-28Merge branch 'master' into smt/planckStephen Tudor
* master: Clarify license on abnt2 keymap (#1038) replace jackhumbert with qmk Add gitter image, start update to qmk org Remove COLEMAK from preonic_keycodes enum layer defines to enum Update readme for smt Preonic keymap Add smt keymap for Preonic updated all the other keymaps to support the new changes. fix: infinity60 keyboard was not using quantum features. Compare Makefile with itself instead of using `--help`
2017-01-27Merge pull request #1043 from potz/patch-1skullydazed
Clarify license on abnt2 keymap (#1038)
2017-01-27Clarify license on abnt2 keymap (#1038)Potiguar Faga
2017-01-27Merge pull request #869 from dylanjgscott/masterJack Humbert
Use `type cmp` to test for cmp in Makefile
2017-01-27Merge remote-tracking branch 'upstream/master'Brendan Johan Lee
2017-01-27[deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keysBrendan Johan Lee
2017-01-27Merge pull request #1035 from qmk/qmk_org_changesJack Humbert
Updated urls due to transfer to qmk org
2017-01-26albert ergodox keymapAlbert Pretorius
2017-01-26Update readmeNic Aitch
2017-01-26Add avrdude targetNic Aitch
2017-01-26Merge remote-tracking branch 'upstream/master'Brendan Johan Lee
2017-01-26replace jackhumbert with qmkJack Humbert
2017-01-26Merge pull request #1029 from SjB/qmk_infinity60Jack Humbert
fix: infinity60 keyboard was not using quantum features.
2017-01-26Merge pull request #1033 from smt/smt/preonicJack Humbert
Add smt's keymap for Preonic