Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge pull request #1041 from folkert4/master | Jack Humbert | 2017-02-07 | 5 | -0/+503 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Added Espynn's keymap | folkert4 | 2017-01-27 | 5 | -0/+503 | |
* | | | | | | | | | Merge pull request #1047 from lordchair/keymap_yale | Jack Humbert | 2017-02-07 | 4 | -0/+144 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
| * | | | | | | | | added picture of layout | Yale Thomas | 2017-01-28 | 1 | -0/+0 | |
| * | | | | | | | | usability tweaks | Yale Thomas | 2017-01-28 | 1 | -44/+49 | |
| * | | | | | | | | mouse keys added | Yale Thomas | 2017-01-28 | 1 | -6/+15 | |
| * | | | | | | | | new 'yale' keymap | Yale Thomas | 2017-01-28 | 3 | -0/+130 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #1048 from smt/smt/planck | Jack Humbert | 2017-02-06 | 5 | -22/+385 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | s/Bkps/Bksp | Stephen Tudor | 2017-01-28 | 1 | -1/+1 | |
| * | | | | | | | | Carry over Planck updates to my Preonic keymap | Stephen Tudor | 2017-01-28 | 2 | -22/+50 | |
| * | | | | | | | | Improve Planck keymap | Stephen Tudor | 2017-01-28 | 2 | -11/+33 | |
| * | | | | | | | | Merge branch 'master' into smt/planck | Stephen Tudor | 2017-01-28 | 28 | -39/+442 | |
| |\| | | | | | | | ||||||
| * | | | | | | | | Add smt keymap for Planck | Stephen Tudor | 2017-01-26 | 3 | -0/+313 | |
* | | | | | | | | | Merge pull request #1059 from qmk/hf/algr_t | Jack Humbert | 2017-02-06 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Introduces ALGR_T for dual-function AltGr | Erez Zukerman | 2017-01-31 | 1 | -0/+1 | |
* | | | | | | | | | | Merge pull request #1036 from nicinabox/lets-split-improvements | Jack Humbert | 2017-02-06 | 2 | -0/+14 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Update readme | Nic Aitch | 2017-01-26 | 1 | -0/+4 | |
| * | | | | | | | | | | Add avrdude target | Nic Aitch | 2017-01-26 | 1 | -0/+10 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #960 from ofples/feature/combos | Jack Humbert | 2017-02-06 | 5 | -0/+194 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Moved combo processing lower down in process logic | Ofer Plesser | 2016-12-16 | 1 | -3/+3 | |
| * | | | | | | | | | | Merge branch 'master' into feature/combos | Ofer Plesser | 2016-12-16 | 71 | -2020/+8113 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Refactored as well as added support for action keys in combos | Ofer Plesser | 2016-12-16 | 2 | -68/+89 | |
| * | | | | | | | | | | | Added support for timing out combos if a key as been pressed for longer than ... | Ofer Plesser | 2016-12-10 | 3 | -31/+101 | |
| * | | | | | | | | | | | Implemented basic key combination feature | Ofer Plesser | 2016-12-10 | 5 | -0/+103 | |
* | | | | | | | | | | | | Merge pull request #1010 from SjB/oneshot_timeout_fix | Jack Humbert | 2017-02-06 | 1 | -8/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | moved oneshot cancellation code outside of process_record. | SjB | 2017-01-29 | 1 | -8/+8 | |
| * | | | | | | | | | | | | oneshot timeout would only timeout after an event. | SjB | 2017-01-15 | 1 | -7/+7 | |
* | | | | | | | | | | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmware | Jack Humbert | 2017-02-06 | 1 | -1/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #981 from jonasoberschweiber/osx-surrogate-pairs | Jack Humbert | 2017-02-06 | 1 | -1/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Add support for supplementary planes for OS X | Jonas Oberschweiber | 2016-12-31 | 1 | -1/+10 | |
* | | | | | | | | | | | | | | | [skip build] testing travis script | Jack Humbert | 2017-02-06 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | / / | [skip build] testing travis script | Jack Humbert | 2017-02-06 | 2 | -1/+3 | |
| |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #1030 from SjB/refactor_register_code16 | Jack Humbert | 2017-02-06 | 1 | -2/+30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | registering a weak_mods when using register_code16 | SjB | 2017-01-29 | 1 | -4/+24 | |
| * | | | | | | | | | | | | | speeding up (un)register_code16 | SjB | 2017-01-23 | 1 | -2/+10 | |
* | | | | | | | | | | | | | | [skip build] testing travis script | Jack Humbert | 2017-02-06 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | [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 | |
| |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #1063 from osamuaoki/master | Erez Zukerman | 2017-02-02 | 1 | -18/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | 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 | 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 | SjB | 2017-01-29 | 2 | -1/+7 | |
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #1054 from deadcyclo/master | Erez Zukerman | 2017-02-01 | 7 | -103/+384 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ |