Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into develop | Nick Brassel | 2022-07-03 | 17 | -390/+2283 |
|\ | |||||
| * | Add a workman-miryoku hybrid keymap for the ferris sweep keyboard (#17511) | bruun-baer | 2022-07-03 | 3 | -0/+112 |
| | | |||||
| * | [keymap] Update gourdo1 keymap for Q2 changes (#17398) | gourdo1 | 2022-07-03 | 14 | -390/+2171 |
| | | |||||
* | | Tentative Teensy 3.5 support (#14420) | Ryan | 2022-07-03 | 5 | -0/+146 |
| | | | | | | | | | | | | | | | | | | | | | | * Tentative Teensy 3.5 support * Set firmware format to .hex for ARM Teensys * Got to "device descriptor failed" by comparing with Teensy 3.6 code * Drop down to 96MHz... * Bump back up to 120MHz | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-02 | 20 | -0/+1767 |
|\| | |||||
| * | Added new keyboard KB16-01 (#17418) | HorrorTroll | 2022-07-03 | 20 | -0/+1767 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-02 | 4 | -122/+77 |
|\| | |||||
| * | My ErgoDox Keymap (finally perfected, I think) (#17208) | IFo Hancroft | 2022-07-03 | 4 | -122/+77 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-02 | 8 | -0/+242 |
|\| | |||||
| * | Add BigBoy macro pad (#16962) | TJ | 2022-07-03 | 8 | -0/+242 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-02 | 15 | -0/+1419 |
|\| | |||||
| * | [Keyboard] Add Support to Ducky One2 SF (#17260) | Khairullah | 2022-07-03 | 15 | -0/+1419 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-02 | 3 | -1/+17 |
|\| | |||||
| * | add rotary encoder support for Quark^2 (#17470) | npspears | 2022-07-03 | 3 | -1/+17 |
| | | |||||
* | | [Keyboard] Update Charybdis code for Extended Mouse reports (#17435) | Drashna Jaelre | 2022-07-02 | 4 | -6/+75 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-02 | 9 | -0/+499 |
|\| | |||||
| * | [Keyboard]KPrepublic bm80v2 Keyboard ANSI support (#17192) | Yizhen Liu | 2022-07-02 | 9 | -0/+499 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-02 | 5 | -0/+1131 |
|\| | |||||
| * | add crkbd/keymaps/bermeo (#17320) | Guilherme Bermêo | 2022-07-02 | 5 | -0/+1131 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-02 | 5 | -11/+40 |
|\| | |||||
| * | [keyboard] annepro2 Add support for sticky keys (#17359) | zv0n | 2022-07-02 | 5 | -11/+40 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-02 | 5 | -603/+872 |
|\| | |||||
| * | Cleanup post-#17314. (#17536) | Nick Brassel | 2022-07-02 | 4 | -203/+199 |
| | | |||||
| * | [keymap] Add tiny text, full width characters to Ergodone->Vega (#17427) | Vega Deftwing | 2022-07-02 | 1 | -400/+673 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-02 | 28 | -0/+1109 |
|\| | |||||
| * | Added 3 new keyboards (#17314) | DeskDaily | 2022-07-02 | 28 | -0/+1109 |
| | | | | | | Co-authored-by: Neil Brian Ramirez <nightlyboards@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-02 | 5 | -0/+549 |
|\| | |||||
| * | feat(keymap): add keebio/iris/rev6/radlinskii keymap (#17216) | Radliński Ignacy | 2022-07-02 | 5 | -0/+549 |
| | | | | | | Co-authored-by: ignacy-radlinski <ignacy.radlinski@schibsted.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-02 | 13 | -0/+814 |
|\| | |||||
| * | [Keyboard] New IDOBAO ID63 (a.k.a. Denwir D60) (#17144) | Vino Rodrigues | 2022-07-02 | 13 | -0/+814 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-02 | 2 | -0/+141 |
|\| | |||||
| * | Added VIA support for Drop CTRL (#17336) | InonL | 2022-07-02 | 2 | -0/+141 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-02 | 4 | -0/+366 |
|\| | |||||
| * | Add keymaps for muralis and kuru (#17337) | Murali S | 2022-07-02 | 4 | -0/+366 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Sree Vidya Sobha Dharmarajan <ssd@Srees-MacBook-Pro.local> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-02 | 9 | -0/+330 |
|\| | |||||
| * | Swift65 Hotswap Support (#16987) | spooknik | 2022-07-02 | 9 | -0/+330 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Steven Phillips <steven.phillips.17@me.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-02 | 8 | -0/+350 |
|\| | |||||
| * | Add Jpe230 Preonic Keymap (#17331) | jpe230 | 2022-07-02 | 4 | -0/+188 |
| | | |||||
| * | Add personal YMDK Split64 keymap (#16980) | Minke Zhang | 2022-07-02 | 4 | -0/+162 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-02 | 7 | -74/+832 |
|\| | |||||
| * | Added oriaj3 keymap with Matrix RGB support for Kimiko keyboard. (#17103) | Jairo Ramírez Ávila | 2022-07-02 | 7 | -74/+832 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-02 | 9 | -0/+238 |
|\| | |||||
| * | Add base Ryujin firmware (#17187) | Wolf Van Herreweghe | 2022-07-02 | 9 | -0/+238 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com> | ||||
* | | [Keyboard] IDOBAO ID67 code touch-ups and include factory keymap (#17231) | Vino Rodrigues | 2022-07-02 | 16 | -387/+703 |
| | | |||||
* | | [Keyboard] IDOBAO ID87v2 code rewrite and include factory keymap (#17232) | Vino Rodrigues | 2022-07-02 | 14 | -391/+713 |
| | | |||||
* | | [Keyboard] IDOBAO ID80v3 code rewrite and include factory keymap (#17234) | Vino Rodrigues | 2022-07-02 | 19 | -449/+790 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-02 | 4 | -71/+250 |
|\| | |||||
| * | Fix line endings. | Nick Brassel | 2022-07-02 | 1 | -25/+25 |
| | | |||||
| * | Update massdrop/alt:charlesrocket (#17297) | -k | 2022-07-02 | 3 | -46/+225 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-02 | 3 | -2/+61 |
|\| |