summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Check for a new serial port every secondNic Aitch2017-02-061-4/+6
* Merge pull request #1048 from smt/smt/planckJack Humbert2017-02-065-22/+385
|\
| * s/Bkps/BkspStephen Tudor2017-01-281-1/+1
| * Carry over Planck updates to my Preonic keymapStephen Tudor2017-01-282-22/+50
| * Improve Planck keymapStephen Tudor2017-01-282-11/+33
| * Merge branch 'master' into smt/planckStephen Tudor2017-01-2828-39/+442
| |\
| * | Add smt keymap for PlanckStephen Tudor2017-01-263-0/+313
* | | Merge pull request #1059 from qmk/hf/algr_tJack Humbert2017-02-061-0/+1
|\ \ \
| * | | Introduces ALGR_T for dual-function AltGrErez Zukerman2017-01-311-0/+1
* | | | Merge pull request #1036 from nicinabox/lets-split-improvementsJack Humbert2017-02-062-0/+14
|\ \ \ \
| * | | | Update readmeNic Aitch2017-01-261-0/+4
| * | | | Add avrdude targetNic Aitch2017-01-261-0/+10
| | |/ / | |/| |
* | | | Merge pull request #960 from ofples/feature/combosJack Humbert2017-02-065-0/+194
|\ \ \ \
| * | | | Moved combo processing lower down in process logicOfer Plesser2016-12-161-3/+3
| * | | | Merge branch 'master' into feature/combosOfer Plesser2016-12-1671-2020/+8113
| |\ \ \ \
| * | | | | Refactored as well as added support for action keys in combosOfer Plesser2016-12-162-68/+89
| * | | | | Added support for timing out combos if a key as been pressed for longer than ...Ofer Plesser2016-12-103-31/+101
| * | | | | Implemented basic key combination featureOfer Plesser2016-12-105-0/+103
* | | | | | 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
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 23:50:04 +0000