summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-252-7/+20
|\
| * search for the readme in higher directories as well (#12997)Zach White2021-05-242-7/+20
* | Do not hard set config in CPTC files (#11864)Drashna Jaelre2021-05-222-6/+7
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-229-0/+321
|\|
| * [Keyboard] AkiS (#12910)Xelus222021-05-229-0/+321
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-221-11/+83
|\|
| * westfoxtrot Cyclops: Configurator key sequence fix (#12979)James Young2021-05-221-11/+83
* | [Keyboard] Fix Terrazzo build failure (#12977)Ryan2021-05-215-24/+68
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-221-10/+84
|\|
| * Caffeinated Serpent65: Configurator layout data fix (#12972)James Young2021-05-211-10/+84
* | Convert Encoder callbacks to be boolean functions (#12805)Drashna Jaelre2021-05-21437-2132/+2539
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-222-2/+2
|\|
| * [Keymap] Fix wrong BASE layer for default and OLED keymaps (#12932)Jay Greco2021-05-212-2/+2
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-224-139/+12
|\|
| * [Keymap] simplify layout in motform keymap (#12927)Love Lagerkvist2021-05-214-139/+12
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-221-2/+2
|\|
| * [Docs] Fix typos in audio config in main config page (#12928)shela2021-05-211-2/+2
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-221-1/+1
|\|
| * [Keyboard] Fix typo in summer breeze hardware layout (#12938)David Fryer2021-05-211-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-2212-1/+352
|\|
| * [Keyboard] Add Prototypist J01 rev 1 support (#12825)Flexerm2021-05-2111-0/+351
| * [Keyboard] Updated NK87 GPIO (#12865)yiancar2021-05-211-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-220-0/+0
|\|
| * [Keyboard] Add WTF60 (#12883)Danny2021-05-210-0/+0
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-2220-0/+1038
|\|
| * [Keyboard] Add WTF60 (#12883)Danny2021-05-2110-0/+292
| * [Keyboard] New Keyboard - Murphpad (#12885)Kyle McCreery2021-05-2110-0/+746
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-2229-0/+1049
|\|
| * [Keyboard] Add support for alfredslab 65 (#12334)spooknik2021-05-2129-0/+1049
* | Add support for up to 4 IS31FL3733 drivers (#12342)Donald Kjer2021-05-215-29/+167
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-224-0/+357
|\|
| * [Keymap] Add kanbara's planck/rev4 keymap (#12486)Jay2021-05-214-0/+357
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-229-0/+343
|\|
| * [Keyboard] Add 75 Pixels Ortholinear Keyboard (#12220)Sendy Aditya Suryana2021-05-219-0/+343
* | ensure we do not conflict with existing keymap aliases (#12976)Zach White2021-05-211-1/+3
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-201-3/+3
|\|
| * fix example code in docs/feature_rgblight.md (#12960)Takeshi ISHII2021-05-201-3/+3
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-201-0/+6
|\|
| * Add EE_HANDS documentation command example (#12730)Albert Y2021-05-201-0/+6
* | Merge remote-tracking branch 'origin/master' into developZach White2021-05-1922-78/+70
|\|
| * Align our subprocess usage with current best practices. (#12940)Zach White2021-05-1922-78/+70
* | matrix: wait for row signal to go HIGH for every row (#12945)Michael Stapelberg2021-05-202-12/+4
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-191-1/+1
|\|
| * revert error introduced in PR #12871 (#12891)Dmitry Mikhirev2021-05-191-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-1811-19/+364
|\|
| * Make sure 'cformat' only runs on core files (#12909)Erovia2021-05-182-7/+17
| * The Uni keyboard. Add keyboard (#12566)Peter Park2021-05-188-0/+335
| * Fix yeehaw (#12934)ridingqwerty2021-05-181-12/+12
* | Fixup housekeeping from being invoked twice per loop. (#12933)Nick Brassel2021-05-186-11/+18
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-174-0/+213
|\|