summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | [skip build] testing travis scriptJack Humbert2017-02-061-1/+5
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | [skip build] testing travis scriptJack Humbert2017-02-061-1/+1
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | [skip build] testing travis scriptJack Humbert2017-02-061-3/+1
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | [skip build] testing travis scriptJack Humbert2017-02-062-19/+25
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | fixes qmk.fm linking, tests out auto version incrementingJack Humbert2017-02-061-1/+20
| | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |
* | / | | | | | | | | | | | | dumber sculpt buildmilestogo2017-02-0914-0/+508
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwaremilestogo2017-02-04121-750/+6291
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #1063 from osamuaoki/masterErez Zukerman2017-02-021-18/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Typo fixes
| | * | | | | | | | | | | | | Typo fixesOsamu Aoki2017-02-021-18/+18
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #1058 from edasque/masterErez Zukerman2017-02-021-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | Reverted Dockerfile to put the CMD back
| | * | | | | | | | | | | | Reverted Dockerfile to put the CMD backErik Dasque2017-01-311-1/+2
| | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #1049 from SjB/tap_dance_save_oneshot_modsErez Zukerman2017-02-012-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | race condition between oneshot_mods and tap_dance
| | * | | | | | | | | | | | race condition between oneshot_mods and tap_danceSjB2017-01-292-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/masterErez Zukerman2017-02-017-103/+384
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | Adds support for ergodox shine and unicode and emoji support to the deadcyclo layout
| | * | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-02-015-30/+900
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #1039 from zabereer/albert_ergodox_keymapErez Zukerman2017-01-314-0/+866
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | albert ergodox keymap
| | * | | | | | | | | | | | albert ergodox keymapAlbert Pretorius2017-01-264-0/+866
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #1055 from matzebond/masterErez Zukerman2017-01-311-30/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | update my neo2 keymap
| | * | | | | | | | | | | update my neo2 keymapMatthias Schmitt2017-01-301-30/+34
| |/ / / / / / / / / / /
| | | * | | | | | | | | [deadcyclo layout] Refactoring. Use custom functions and macrosBrendan Johan Lee2017-01-301-237/+266
| | | | | | | | | | | |
| | | * | | | | | | | | [deadcyclo layout] fixed failing testsBrendan Johan Lee2017-01-301-16/+1
| | | | | | | | | | | |
| | | * | | | | | | | | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-302-2/+18
| | | |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #1043 from potz/patch-1skullydazed2017-01-271-0/+16
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | Clarify license on abnt2 keymap (#1038)
| | * | | | | | | | | | Clarify license on abnt2 keymap (#1038)Potiguar Faga2017-01-271-0/+16
| |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #869 from dylanjgscott/masterJack Humbert2017-01-271-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use `type cmp` to test for cmp in Makefile
| | * | | | | | | | | | Compare Makefile with itself instead of using `--help`Dylan Scott2017-01-241-2/+2
| | | | | | | | | | | |
| | | | * | | | | | | | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-2716-22/+22
| | | | |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #1035 from qmk/qmk_org_changesJack Humbert2017-01-2716-22/+22
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | Updated urls due to transfer to qmk org
| | * | | | | | | | | | replace jackhumbert with qmkJack Humbert2017-01-2616-22/+22
| |/ / / / / / / / / /
| | | * | | | | | | | [deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keysBrendan Johan Lee2017-01-274-23/+26
| | | | | | | | | | |
| | | * | | | | | | | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-2611-16/+403
| | | |\ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #1029 from SjB/qmk_infinity60Jack Humbert2017-01-265-0/+46
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fix: infinity60 keyboard was not using quantum features.
| | * | | | | | | | | | updated all the other keymaps to support the new changes.SjB2017-01-243-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |