Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-19 | 1 | -1/+1 |
|\ | |||||
| * | revert error introduced in PR #12871 (#12891) | Dmitry Mikhirev | 2021-05-19 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-18 | 9 | -12/+347 |
|\| | |||||
| * | The Uni keyboard. Add keyboard (#12566) | Peter Park | 2021-05-18 | 8 | -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) | ridingqwerty | 2021-05-18 | 1 | -12/+12 |
| | | | | | | | | | | * CRLF? * Changed VIA keymap to use core KC_TRNS alias | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-17 | 4 | -0/+213 |
|\| | |||||
| * | [Keymap] Crkbd/keymaps/oo (#12882) | Oliver Ocean | 2021-05-17 | 4 | -0/+213 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-17 | 9 | -0/+243 |
|\| | |||||
| * | Added Yasui keyboard (#12726) | rainkeebs | 2021-05-17 | 9 | -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 develop | QMK Bot | 2021-05-17 | 9 | -0/+307 |
|\| | |||||
| * | Add Yeehaw Keyboard (#12705) | Caleb Lightfoot | 2021-05-17 | 9 | -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 develop | QMK Bot | 2021-05-17 | 9 | -0/+293 |
|\| | |||||
| * | [Keyboard] Friedrich (#12569) | kb-elmo | 2021-05-17 | 9 | -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 develop | QMK Bot | 2021-05-16 | 1 | -1/+1 |
|\| | |||||
| * | [Keyboard] Update Rosa vendorId to something unique for VIA (#12918) | Brandon Lee | 2021-05-16 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-16 | 15 | -0/+456 |
|\| | |||||
| * | [Keyboard] Added bradpad support (#12912) | wxyangf | 2021-05-16 | 15 | -0/+456 |
| | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-16 | 9 | -0/+685 |
|\| | |||||
| * | [Keyboard] Giant macro pad (#12905) | Callum Hart | 2021-05-16 | 9 | -0/+685 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-16 | 3 | -0/+121 |
|\| | |||||
| * | [Keymap] Add new quefrency keymap (#12913) | Jonavin | 2021-05-16 | 3 | -0/+121 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-16 | 12 | -0/+523 |
|\| | |||||
| * | [Keyboard] Add scylla keyboard (#12720) | Quentin | 2021-05-16 | 12 | -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 develop | QMK Bot | 2021-05-16 | 7 | -0/+197 |
|\| | |||||
| * | [Keyboard] Added Perixx Periboard-512 Converter (#12324) | Sife-ops | 2021-05-15 | 7 | -0/+197 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-16 | 2 | -1/+2 |
|\| | |||||
| * | [Keyboard] Rebound underglow settings for via (#12268) | Ross Montsinger | 2021-05-15 | 2 | -1/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-16 | 13 | -0/+902 |
|\| | |||||
| * | [Keyboard] Add merro60 (#12527) | chalex | 2021-05-15 | 13 | -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 develop | QMK Bot | 2021-05-16 | 18 | -38/+213 |
|\| | |||||
| * | [Keyboard] Add SiddersKB Majbritt Rev2 (#12598) | Sleepdealer | 2021-05-15 | 18 | -38/+213 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-16 | 3 | -0/+372 |
|\| | |||||
| * | [Keymap] Reviung41_Ciutadellla (#12668) | Ciutadellla | 2021-05-15 | 3 | -0/+372 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-16 | 8 | -0/+329 |
|\| | |||||
| * | [Keyboard] Add Specskeys support (#12813) | Nico | 2021-05-15 | 8 | -0/+329 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-16 | 9 | -0/+376 |
|\| | |||||
| * | [Keyboard] Added Bolsa Supply Midway60 Keyboard (#12747) | Felix Jen | 2021-05-15 | 9 | -0/+376 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-16 | 19 | -0/+1035 |
|\| | |||||
| * | [Keyboard] Added Lucid KB Scarlet [Maker KB] (#12748) | Felix Jen | 2021-05-15 | 9 | -0/+394 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
| * | [Keyboard] Add Chevron (#12762) | Ramon Imbao | 2021-05-15 | 10 | -0/+641 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-16 | 17 | -0/+618 |
|\| | |||||
| * | [Keyboard] Add Rosa (#12884) | Brandon Lee | 2021-05-15 | 17 | -0/+618 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-15 | 11 | -0/+345 |
|\| | |||||
| * | [Keyboard] Add Potato65 Hotswap keyboard (#12874) | Aeonstrife | 2021-05-15 | 11 | -0/+345 |
| | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-15 | 10 | -0/+336 |
|\| | |||||
| * | [Keyboard] Add Frusta Fundamental (#12583) | William Lam | 2021-05-15 | 10 | -0/+336 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'upstream/master' into develop | fauxpark | 2021-05-15 | 17 | -297/+702 |
|\| | |||||
| * | [Keyboard] Add Neopad macropad (#12614) | rookiebwoy | 2021-05-14 | 10 | -0/+387 |
| | | |||||
| * | Fix Marauder and add readme (#12906) | Ryan | 2021-05-14 | 7 | -297/+315 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-05-14 | 25 | -88/+1099 |
|\| |