Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | | | | | | | [skip build] testing travis script | Jack Humbert | 2017-02-06 | 1 | -1/+5 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | [skip build] testing travis script | Jack Humbert | 2017-02-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | [skip build] testing travis script | Jack Humbert | 2017-02-06 | 1 | -3/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | [skip build] testing travis script | Jack Humbert | 2017-02-06 | 2 | -19/+25 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | fixes qmk.fm linking, tests out auto version incrementing | Jack Humbert | 2017-02-06 | 1 | -1/+20 | |
| | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | ||||||
* | / | | | | | | | | | | | | | dumber sculpt build | milestogo | 2017-02-09 | 14 | -0/+508 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | milestogo | 2017-02-04 | 121 | -750/+6291 | |
|\| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge pull request #1063 from osamuaoki/master | Erez Zukerman | 2017-02-02 | 1 | -18/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Typo fixes | |||||
| | * | | | | | | | | | | | | | Typo fixes | Osamu Aoki | 2017-02-02 | 1 | -18/+18 | |
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge pull request #1058 from edasque/master | Erez Zukerman | 2017-02-02 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | Reverted Dockerfile to put the CMD back | |||||
| | * | | | | | | | | | | | | Reverted Dockerfile to put the CMD back | Erik Dasque | 2017-01-31 | 1 | -1/+2 | |
| | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge pull request #1049 from SjB/tap_dance_save_oneshot_mods | Erez Zukerman | 2017-02-01 | 2 | -1/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | race condition between oneshot_mods and tap_dance | |||||
| | * | | | | | | | | | | | | race condition between oneshot_mods and tap_dance | SjB | 2017-01-29 | 2 | -1/+7 | |
| | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| * | | | | | | | | | | | | Merge pull request #1054 from deadcyclo/master | Erez Zukerman | 2017-02-01 | 7 | -103/+384 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | Adds support for ergodox shine and unicode and emoji support to the deadcyclo layout | |||||
| | * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | Brendan Johan Lee | 2017-02-01 | 5 | -30/+900 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge pull request #1039 from zabereer/albert_ergodox_keymap | Erez Zukerman | 2017-01-31 | 4 | -0/+866 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | albert ergodox keymap | |||||
| | * | | | | | | | | | | | | albert ergodox keymap | Albert Pretorius | 2017-01-26 | 4 | -0/+866 | |
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge pull request #1055 from matzebond/master | Erez Zukerman | 2017-01-31 | 1 | -30/+34 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | update my neo2 keymap | |||||
| | * | | | | | | | | | | | update my neo2 keymap | Matthias Schmitt | 2017-01-30 | 1 | -30/+34 | |
| |/ / / / / / / / / / / | ||||||
| | | * | | | | | | | | | [deadcyclo layout] Refactoring. Use custom functions and macros | Brendan Johan Lee | 2017-01-30 | 1 | -237/+266 | |
| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | [deadcyclo layout] fixed failing tests | Brendan Johan Lee | 2017-01-30 | 1 | -16/+1 | |
| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | Merge remote-tracking branch 'upstream/master' | Brendan Johan Lee | 2017-01-30 | 2 | -2/+18 | |
| | | |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge pull request #1043 from potz/patch-1 | skullydazed | 2017-01-27 | 1 | -0/+16 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | Clarify license on abnt2 keymap (#1038) | |||||
| | * | | | | | | | | | | Clarify license on abnt2 keymap (#1038) | Potiguar Faga | 2017-01-27 | 1 | -0/+16 | |
| |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | Merge pull request #869 from dylanjgscott/master | Jack Humbert | 2017-01-27 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Use `type cmp` to test for cmp in Makefile | |||||
| | * | | | | | | | | | | Compare Makefile with itself instead of using `--help` | Dylan Scott | 2017-01-24 | 1 | -2/+2 | |
| | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | Merge remote-tracking branch 'upstream/master' | Brendan Johan Lee | 2017-01-27 | 16 | -22/+22 | |
| | | | |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge pull request #1035 from qmk/qmk_org_changes | Jack Humbert | 2017-01-27 | 16 | -22/+22 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | Updated urls due to transfer to qmk org | |||||
| | * | | | | | | | | | | replace jackhumbert with qmk | Jack Humbert | 2017-01-26 | 16 | -22/+22 | |
| |/ / / / / / / / / / | ||||||
| | | * | | | | | | | | [deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keys | Brendan Johan Lee | 2017-01-27 | 4 | -23/+26 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Merge remote-tracking branch 'upstream/master' | Brendan Johan Lee | 2017-01-26 | 11 | -16/+403 | |
| | | |\ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #1029 from SjB/qmk_infinity60 | Jack Humbert | 2017-01-26 | 5 | -0/+46 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | fix: infinity60 keyboard was not using quantum features. | |||||
| | * | | | | | | | | | | updated all the other keymaps to support the new changes. | SjB | 2017-01-24 | 3 | -0/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |