summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1010 from SjB/oneshot_timeout_fixJack Humbert2017-02-061-8/+8
|\
| * moved oneshot cancellation code outside of process_record.SjB2017-01-291-8/+8
| * oneshot timeout would only timeout after an event.SjB2017-01-151-7/+7
* | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert2017-02-061-1/+10
|\ \
| * \ Merge pull request #981 from jonasoberschweiber/osx-surrogate-pairsJack Humbert2017-02-061-1/+10
| |\ \
| | * | Add support for supplementary planes for OS XJonas Oberschweiber2016-12-311-1/+10
* | | | [skip build] testing travis scriptJack Humbert2017-02-061-1/+1
|/ / /
* | | [skip build] testing travis scriptJack Humbert2017-02-062-1/+3
* | | Merge pull request #1030 from SjB/refactor_register_code16Jack Humbert2017-02-061-2/+30
|\ \ \
| * | | registering a weak_mods when using register_code16SjB2017-01-291-4/+24
| * | | speeding up (un)register_code16SjB2017-01-231-2/+10
* | | | [skip build] testing travis scriptJack Humbert2017-02-061-1/+1
* | | | [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
* | | | Merge pull request #1063 from osamuaoki/masterErez Zukerman2017-02-021-18/+18
|\ \ \ \
| * | | | 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 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_danceSjB2017-01-292-1/+7
* | | | | | Merge pull request #1054 from deadcyclo/masterErez Zukerman2017-02-017-103/+384
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | 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 keymapAlbert Pretorius2017-01-264-0/+866
* | | | | | | Merge pull request #1055 from matzebond/masterErez Zukerman2017-01-311-30/+34
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | 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)Potiguar Faga2017-01-271-0/+16
|/ / / / / /
* | | | | | Merge pull request #869 from dylanjgscott/masterJack Humbert2017-01-271-2/+2
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | 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
|\ \ \ \ \ \
| * | | | | | updated all the other keymaps to support the new changes.SjB2017-01-243-0/+28
| * | | | | | fix: infinity60 keyboard was not using quantum features.SjB2017-01-232-0/+18
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #1033 from smt/smt/preonicJack Humbert2017-01-263-0/+335
|\ \ \ \ \ \
| * | | | | | Remove COLEMAK from preonic_keycodes enumStephen Tudor2017-01-251-1/+0
| * | | | | | Update readme for smt Preonic keymapStephen Tudor2017-01-251-1/+85
| * | | | | | Add smt keymap for PreonicStephen Tudor2017-01-253-0/+252
* | | | | | | Add gitter image, start update to qmk orgJack Humbert2017-01-261-3/+3
* | | | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert2017-01-253-3/+66
|\| | | | | |