summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* RESET -> QK_BOOT user keymaps (#17940)Joel Challis2022-08-211495-1908/+2006
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-2164-114/+152
|\
| * Move keyboard USB IDs and strings to data driven, pass 3 (#18111)Ryan2022-08-2164-114/+152
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-215-0/+454
|\|
| * Add pcewing Speedo v3 keymap (#18118)Paul Ewing2022-08-215-0/+454
| | | | | | | | | | * Add pcewing Speedo v3 keymap * Add readme and code quality improvements
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-214-0/+81
|\|
| * [Keymap] Add new keymap to nasu (#18024)Mario Cadenas2022-08-214-0/+81
| |
* | Align CLI requirements (#18117)Joel Challis2022-08-211-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-215-0/+130
|\|
| * [Keyboard] Add ai macropad (#17722)Louis Dalibard2022-08-205-0/+130
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Louis Dalibard <ontake@ontake.dev>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-203-0/+238
|\|
| * added keymap for kprepublic/jj40:brdlf (#17961)Abigail2022-08-203-0/+238
| | | | | | | | | | * added keymap for kprepublic/jj40:brdlf
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-2012-0/+872
|\|
| * [Keyboard] Add yandrstudio/nz67v2 keyboard. (#17591)JX2022-08-2012-0/+872
| | | | | | * add yr nz67v2 by jiaxin96
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-201-29/+29
|\|
| * Format code according to conventions (#18119)QMK Bot2022-08-201-29/+29
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-2011-0/+563
|\|
| * add fungo keyboard (#17513)bojiguard2022-08-2011-0/+563
| | | | | | by bojiguard
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-2011-0/+331
|\|
| * Add Nascent keyboard support. (#17824)studiokestra2022-08-2011-0/+331
| | | | | | * Add nascent keyboard by studiokestra
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-2029-0/+852
|\|
| * [Keyboard] Add Zed65 (#17917)mechlovin2022-08-2029-0/+852
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2022-08-20353-374/+374
|\|
| * RESET -> QK_BOOT keyboard readme (#18110)Joel Challis2022-08-20353-374/+374
| |
* | Fix PID value for the Keyboardio Atreus 2 bootloader (#18116)Sergey Vlasov2022-08-201-1/+1
| | | | | | Copy the correct PID from `util/udev/50-qmk.rules`.
* | CLI: Teaching the CLI to flash binaries (#16584)Erovia2022-08-208-93/+363
| | | | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Sergey Vlasov <sigprof@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-202-0/+112
|\|
| * [Keymap] Add joe_scotto keymap for CRKBD (#18103)Joe Scotto2022-08-192-0/+112
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-201-0/+4
|\|
| * [Keyboard] Fix compilation issues for keycapsss kimiko (#18112)Drashna Jaelre2022-08-201-0/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-204-0/+84
|\|
| * [Keymap] Add Miryoku keymap for Hillside family (#18087)Davide Masserut2022-08-194-0/+84
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-2019-0/+1164
|\|
| * [Keyboard] Add aliceh66 pianoforte (#18081)AliceH662022-08-1919-0/+1164
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2022-08-20550-1819/+1689
|\|
| * Move keyboard USB IDs and strings to data driven, pass 2: S-Y (#18093)Ryan2022-08-20119-386/+351
| |
| * Move keyboard USB IDs and strings to data driven, pass 2: M-O (#18090)Ryan2022-08-20146-452/+418
| |
| * Move keyboard USB IDs and strings to data driven, pass 2: P-R (#18091)Ryan2022-08-2098-375/+282
| |
| * Move keyboard USB IDs and strings to data driven, pass 2: J-L (#18080)Ryan2022-08-20187-602/+638
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-20121-293/+309
|\|
| * Move keyboard USB IDs and strings to data driven, pass 2: handwired (#18079)Ryan2022-08-20121-293/+309
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-1923-355/+80
|\|
| * [Keyboard] Update Work Louder keyboards (#18109)Drashna Jaelre2022-08-1923-355/+80
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-194-217/+0
|\|
| * Fix duplicate keys in info.json files (#18107)Joel Challis2022-08-194-217/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-1913-0/+343
|\|
| * Cyberstar Custom (#18076)yiancar2022-08-1913-0/+343
| | | | | | | | | | * Create Cyberstar Custom Co-authored-by: yiancar <yiancar@gmail.com>
* | Use the correct bootloader definition. (#18102)Nick Brassel2022-08-191-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-191-1/+1
|\|
| * [Docs] Fix typo in data driven config docs (#18095)Simon Hengel2022-08-181-1/+1
| |