summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-191-1/+4
|\|
| * [Docs] Update list of "ARM-based ProMicro replacements" (#18083)~ aka goonf!sh2022-08-181-1/+4
| |
* | Remove legacy bootmagic cli parsing (#18099)Joel Challis2022-08-191-8/+1
| |
* | Fix new-keyboard default for RP2040 bootloader (#18100)Joel Challis2022-08-191-0/+1
| |
* | Swap F4x1 default board files away from blackpill (#17522)Joel Challis2022-08-191-2/+2
| |
* | Add support keyboard Feker IK75 (#17611)HorrorTroll2022-08-1812-0/+1138
| |
* | Add Bonsai C4 converter (#17711)David Hoelscher2022-08-1810-9/+256
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-172-42/+33
|\|
| * Fixup mokey/ibis80 keymaps (#18088)jack2022-08-172-42/+33
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-172-2/+3
|\|
| * Replace CG_SWAP in junonum (#18086)Juno Nguyen2022-08-172-2/+3
| | | | | | Co-authored-by: Minh-tri Nguyen <mtngx@PigeonMac.local>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-174-0/+309
|\|
| * [Keymap] Add personal keymap for kprepublic BM40HSRGB (#18021)CoffeeIsLife2022-08-174-0/+309
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Fae <faenkhauser@gmail.com>
* | [Keyboard] add 'soda/cherish' (#18057)ZhaoYou2022-08-1711-0/+405
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-179-0/+461
|\|
| * [Keyboard] Add ibis80 (#18051)Runheme2022-08-169-0/+461
| | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-173-105/+7
|\|
| * [Keymap] toshi0383 keymaps update (#18073)Toshihiro Suzuki2022-08-163-105/+7
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-173-46/+30
|\|
| * [Docs] Use layer number as example for COMBO_ONLY_FROM_LAYER (#18072)Albert Y2022-08-161-1/+1
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keymap] jotix's community/ortho4x12 change (#18069)jotix2022-08-162-45/+29
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-161-6/+6
|\|
| * Adjust the hierarchy of chapter `Deferred Execution` (#18075)coliss862022-08-161-6/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-162-1/+3
|\|
| * Fix WS2812 order for aurora65 and loki65 (#18074)yiancar2022-08-162-1/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-161-3/+6
|\|
| * [Docs] update pr_checklist.md with info about data-driven (#18068)Tom Barnes2022-08-161-3/+6
| | | | | | | | | | * update pr_checklist with info about data-driven Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-161-1/+1
|\|
| * Use correct board file in xelus/valor_frl_tkl/rev2_0 (#18071)Joel Challis2022-08-161-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-1513-15/+11
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 17:09:22 +0000