summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developZach White2021-05-102-71/+124
|\
| * Move the module checking and updating to lib/python (#12416)Zach White2021-05-102-68/+121
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-106-79/+166
|\|
| * Improve our CI tests (#11476)Zach White2021-05-106-79/+166
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-101-18/+86
|\|
| * Lagrange handwired Configurator bugfix (#12854)James Young2021-05-101-18/+86
* | Fix another bin/qmk reference (#12856)Sergey Vlasov2021-05-101-1/+1
* | Make Swap Hands use PROGMEM (#12284)Drashna Jaelre2021-05-0947-53/+53
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-091-0/+13
|\|
| * Catch 'LAYOUTS = all' in lint (#12848)Joel Challis2021-05-091-0/+13
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-097-117/+188
|\|
| * KBDMini refactor (#12850)Ryan2021-05-107-117/+188
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-091-3/+3
|\|
| * fix the makefile snippet so flake8 and yapf don't fight (#12849)Zach White2021-05-091-3/+3
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-091-1/+1
|\|
| * CLI: Use BASH if SHELL variable is not set (Windows) (#12847)Erovia2021-05-091-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-092-8/+11
|\|
| * [CI] Format code according to conventions (#12838)github-actions[bot]2021-05-102-8/+11
* | Remove pointless SERIAL_LINK_ENABLE rules (#12846)Ryan2021-05-1016-16/+0
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-093-1/+89
|\|
| * Add script to perform parallel builds. (#12497)Nick Brassel2021-05-093-1/+89
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-091-3/+3
|\|
| * Align qmk info ascii logic with milc logging (#11627)Joel Challis2021-05-091-3/+3
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-092-12/+30
|\|
| * Allow MAKE environment override for 'qmk clean' (#12473)Joel Challis2021-05-092-12/+30
* | New command: qmk console (#12828)Zach White2021-05-0812-22/+378
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-091-1/+1
|\|
| * haptic: correct size of reserved field in the haptic structure. This saves 1 ...Purdea Andrei2021-05-081-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-098-0/+630
|\|
| * add ttys0's planck and preonic keymaps (#10560)Sean Johnson2021-05-088-0/+630
* | Resolve a number of warnings in `qmk generate-api` (#12833)Zach White2021-05-0831-44/+42
* | fix some references to bin/qmk that slipped in (#12832)Zach White2021-05-083-3/+3
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-0816-224/+604
|\|
| * Update sethBarberee Userspace (#12620)Seth Barberee2021-05-0816-224/+604
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-082-38/+40
|\|
| * Hbbisenieks keymap update to remove kc_ keymaps (#12391)Hilary B. Brenum2021-05-082-38/+40
* | Added OLED fade out support (#12086)Barabas2021-05-083-2/+29
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-071-16/+4
|\|
| * Update FreeBSD install method (#12815)Mateusz Piotrowski2021-05-071-16/+4
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-072-0/+51
|\|
| * [Keymap] My Arisu layout setup (#12647)stanrc852021-05-072-0/+51
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-061-7/+7
|\|
| * Fix DZ60 64 key layout (#12551)kb-elmo2021-05-061-7/+7
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-061-0/+17
|\|
| * Add docs on multiple encoders sharing pins (#11678)timothynsheehan2021-05-061-0/+17
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-061-3/+20
|\|
| * Add a handful of consumer/gendesk page usages (#12811)Ryan2021-05-061-3/+20
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-051-1/+3
|\|
| * Fix qmk flash on FreeBSD (#12085)Mateusz Piotrowski2021-05-061-1/+3
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-049-0/+240
|\|