summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-302-1/+14
|\
| * [Keyboard] Changed ProductID on basketweav keyboards (#14162)Vincent Vorholter2021-08-302-1/+14
* | Remove bin/qmk (#14231)Zach White2021-08-2914-114/+11
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-291-1/+7
|\|
| * ensure that the directory for sys.executable is in the user's path (#14229)Zach White2021-08-291-1/+7
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-2913-17/+16
|\|
| * move everything from qmkfm/base_container to qmkfm/qmk_cli (#14230)Zach White2021-08-2913-17/+16
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-291-21/+21
|\|
| * Nyquist (#14202)peott-fr2021-08-291-21/+21
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-293-74/+86
|\|
| * Update the nix-shell environment (#13316)Sergey Vlasov2021-08-293-74/+86
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-299-0/+581
|\|
| * [Keyboard] Add Viktus SP Mini (#14069)J.Flanagan2021-08-299-0/+581
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-296-11/+126
|\|
| * [Keyboard] Corrected layout for np24 by YMDK (#14096)Trent Hoh2021-08-296-11/+126
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-291-0/+97
|\|
| * [Keymap] My Prime E keymap (#14117)peott-fr2021-08-291-0/+97
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-299-0/+302
|\|
| * [Keyboard] Add kelownaRGB64 (#14141)Weirdo2021-08-299-0/+302
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-291-8/+19
|\|
| * [Keyboard] fix compile error `make helix/rev2/sc:all` (#14214)Takeshi ISHII2021-08-291-8/+19
* | fix automatic directory for qmk lint (#14215)Zach White2021-08-281-5/+5
* | Add check for non-assignment code in rules.mk (#12108)Zach White2021-08-291-41/+98
* | remove qmk console, which is now part of the global cli (#14206)Zach White2021-08-293-352/+0
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-291-1/+10
|\|
| * Fixup upstream paths for submodules. (#14205)Nick Brassel2021-08-291-1/+10
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-281-1/+1
|\|
| * Bootmagic lite docs clarity. (#14204)Nick Brassel2021-08-291-1/+1
* | add 'include keyboard_features.mk' into build_keyboard.mk (#8422)Takeshi ISHII2021-08-292-0/+47
|/
* Breaking changes develop merge to master, 2021Q3 edition. (#14196)Nick Brassel2021-08-295477-60000/+76245
|\
| * 2021Q3 pre-merge `develop` changelog, keyboard aliases (#14198)Nick Brassel2021-08-295-6/+683
| * [Docs] Add examples to RGB Matrix Indicators docs (#12797)Drashna Jaelre2021-08-271-0/+39
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-269-0/+237
| |\ | |/ |/|
* | Add support for lazydesigners/cassette8 (#14145)jackytrabbit2021-08-269-0/+237
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-2613-0/+418
| |\ | |/ |/|
* | New Keyboard - V4n4g0rth0n (#14152)jpuerto962021-08-2613-0/+418
| * Update readme files (#14172)Joel Challis2021-08-2625-79/+74
| * Move to correct location (#14171)Joel Challis2021-08-262-0/+0
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-261-1/+1
| |\ | |/ |/|
* | Skeletn87 - Fix RGB pin (#14170)kb-elmo2021-08-261-1/+1
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-259-0/+442
| |\ | |/ |/|
* | [keyboard] Add 0x3E (#14088)Charles2021-08-269-0/+442
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-251-1/+1
| |\ | |/ |/|
* | [converter/a1200] Changing layout macro reference info.json (#14143)8bits4ever2021-08-261-1/+1
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-254-0/+317
| |\ | |/ |/|
* | [Keymap] mechmaster48 keymap for OLKB Preonic rev3 (#14137)MechMaster482021-08-254-0/+317
| * Move nix folder alongside vagrant (#14132)Joel Challis2021-08-255-2/+2
| * Revert 14083 && 14144 (#14150)Joel Challis2021-08-258-118/+104
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-241-9/+9
| |\ | |/ |/|
* | [Keyboard] Update Technik ortholinear RGB matrix points (#14124)Albert Y2021-08-241-9/+9