summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-161-1/+1
|\
| * [Keyboard] Update Rosa vendorId to something unique for VIA (#12918)Brandon Lee2021-05-161-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-1615-0/+456
|\|
| * [Keyboard] Added bradpad support (#12912)wxyangf2021-05-1615-0/+456
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-169-0/+685
|\|
| * [Keyboard] Giant macro pad (#12905)Callum Hart2021-05-169-0/+685
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-163-0/+121
|\|
| * [Keymap] Add new quefrency keymap (#12913)Jonavin2021-05-163-0/+121
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-1612-0/+523
|\|
| * [Keyboard] Add scylla keyboard (#12720)Quentin2021-05-1612-0/+523
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: bstiq <qlebastard@outlook.com>
* | Use milc.subcommand.config instead of qmk.cli.config (#12915)Zach White2021-05-163-124/+1
| | | | | | | | | | | | | | * Use milc.subcommand.config instead * pyformat * remove the config test
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-167-0/+197
|\|
| * [Keyboard] Added Perixx Periboard-512 Converter (#12324)Sife-ops2021-05-157-0/+197
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-162-1/+2
|\|
| * [Keyboard] Rebound underglow settings for via (#12268)Ross Montsinger2021-05-152-1/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-1613-0/+902
|\|
| * [Keyboard] Add merro60 (#12527)chalex2021-05-1513-0/+902
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: chalex <alejandrelee+magbogbro@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-1618-38/+213
|\|
| * [Keyboard] Add SiddersKB Majbritt Rev2 (#12598)Sleepdealer2021-05-1518-38/+213
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-163-0/+372
|\|
| * [Keymap] Reviung41_Ciutadellla (#12668)Ciutadellla2021-05-153-0/+372
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-168-0/+329
|\|
| * [Keyboard] Add Specskeys support (#12813)Nico2021-05-158-0/+329
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-169-0/+376
|\|
| * [Keyboard] Added Bolsa Supply Midway60 Keyboard (#12747)Felix Jen2021-05-159-0/+376
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-1619-0/+1035
|\|
| * [Keyboard] Added Lucid KB Scarlet [Maker KB] (#12748)Felix Jen2021-05-159-0/+394
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Keyboard] Add Chevron (#12762)Ramon Imbao2021-05-1510-0/+641
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-1617-0/+618
|\|
| * [Keyboard] Add Rosa (#12884)Brandon Lee2021-05-1517-0/+618
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-1511-0/+345
|\|
| * [Keyboard] Add Potato65 Hotswap keyboard (#12874)Aeonstrife2021-05-1511-0/+345
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-1510-0/+336
|\|
| * [Keyboard] Add Frusta Fundamental (#12583)William Lam2021-05-1510-0/+336
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-05-1517-297/+702
|\|
| * [Keyboard] Add Neopad macropad (#12614)rookiebwoy2021-05-1410-0/+387
| |
| * Fix Marauder and add readme (#12906)Ryan2021-05-147-297/+315
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-1425-88/+1099
|\|
| * [Keyboard] Add Marauder (#12550)Cosmin2021-05-146-0/+297
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Keyboard] split right shift iso layout for ok60 (#12890)Faehriss2021-05-141-0/+14
| |
| * TKC Portico: layout macro/Configurator touch-up (#12897)James Young2021-05-146-88/+97
| |
| * [Keyboard] Add UM-70 (#12556)duoshock2021-05-1412-0/+691
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: online <33636898+online@users.noreply.github.com>
* | [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895)Dave Vandyke2021-05-141-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-149-0/+371
|\|
| * [Keyboard] Added FJLabs Polaris (#12746)Felix Jen2021-05-139-0/+371
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-1416-3/+613
|\|
| * [Keymap] csc027/keymap-updates (#12694)csc0272021-05-133-3/+38
| |
| * [Keyboard] Add Studio Kestra Cascade PCB (#12704)studiokestra2021-05-1313-0/+575
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-148-0/+4859
|\|
| * [Keyboard] Add Training Wheel 40 (#12542)KnoblesseOblige2021-05-138-0/+4859
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 16:47:13 +0000