summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-191-1/+1
|\
| * revert error introduced in PR #12871 (#12891)Dmitry Mikhirev2021-05-191-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-189-12/+347
|\|
| * The Uni keyboard. Add keyboard (#12566)Peter Park2021-05-188-0/+335
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * first commit * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * Apply suggestions from code review by ridingqwerty Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
| * Fix yeehaw (#12934)ridingqwerty2021-05-181-12/+12
| | | | | | | | | | * CRLF? * Changed VIA keymap to use core KC_TRNS alias
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-174-0/+213
|\|
| * [Keymap] Crkbd/keymaps/oo (#12882)Oliver Ocean2021-05-174-0/+213
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-179-0/+243
|\|
| * Added Yasui keyboard (#12726)rainkeebs2021-05-179-0/+243
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * initial * fix * Update config.h * Update config.h * Update rules.mk * Delete info.json * fuix * PR work * replace keymap with layout Co-authored-by: rainsff <44819800+rainsff@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-179-0/+307
|\|
| * Add Yeehaw Keyboard (#12705)Caleb Lightfoot2021-05-179-0/+307
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add files for Yeehaw keyboard. * Modified config.h and default keymap. * Update keyboards/yeehaw/rules.mk Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> * Update keyboards/yeehaw/readme.md Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> * Update keyboards/yeehaw/readme.md Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> * Update keyboards/yeehaw/keymaps/via/keymap.c Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> * Update keyboards/yeehaw/keymaps/via/keymap.c Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> * Update keyboards/yeehaw/keymaps/via/keymap.c Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> * Apply suggestions from georges review Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> * Remove Unnecessary Defines Co-authored-by: Drashna Jaelre <drashna@live.com> * Changed keymap licenses 📃 Co-authored-by: Tsqaushv2 <61706196+Tsqaushv2@users.noreply.github.com> Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-179-0/+293
|\|
| * [Keyboard] Friedrich (#12569)kb-elmo2021-05-179-0/+293
| | | | | | | | | | | | | | | | | | | | | | | | * added Friedrich * Update readme.md * Update readme.md * Update keyboards/friedrich/keymaps/via/rules.mk * change USB name casing
* | 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>
* | 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
|\|