Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into develop | fauxpark | 2021-12-09 | 1835 | -3296/+1835 |
|\ | |||||
| * | Tidy up NKRO_ENABLE rules (#15382) | Ryan | 2021-12-09 | 1837 | -3296/+1837 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-09 | 235 | -3915/+0 |
|\| | |||||
| * | Remove empty config.h from default-ish keymaps (#15429) | Ryan | 2021-12-09 | 235 | -3915/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-08 | 1 | -1/+1 |
|\| | |||||
| * | [Keyboard] Fix minor typo in Ploopy Trackball Docs (#14846) | tangowithfoxtrot | 2021-12-08 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-08 | 2 | -2/+4 |
|\| | |||||
| * | [Keyboard] Flip encoder and fix weird volume behavior for Herringbone Pro ↵ | Ramon Imbao | 2021-12-08 | 2 | -2/+4 |
| | | | | | | | | | | (#15423) Co-authored-by: Joel Challis <git@zvecr.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | Drashna Jael're | 2021-12-08 | 150 | -665/+514 |
|\| | |||||
| * | [Keyboard] Add Contender (#15403) | sotoba | 2021-12-08 | 9 | -0/+421 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
| * | Remove references to Makefile in keyboard-level rules.mk (#15427) | Ryan | 2021-12-07 | 145 | -679/+95 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-07 | 1 | -2/+2 |
|\| | |||||
| * | [Keyboard] Fix minor typo in Ploopy Trackball Mini Docs (#14845) | tangowithfoxtrot | 2021-12-07 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-07 | 5 | -22/+105 |
|\| | |||||
| * | [Keymap] 3w6 helltm keymap combos (#15393) | HellTM | 2021-12-07 | 5 | -22/+105 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-07 | 19 | -0/+954 |
|\| | |||||
| * | [Keyboard] Add stickey4 keyboard (#15396) | yfuku | 2021-12-07 | 10 | -0/+416 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
| * | [Keyboard] Add jolofsor folder and denial75 subfolder under QMK keyboards ↵ | jolofsor | 2021-12-07 | 9 | -0/+538 |
| | | | | | | | | | | | | (#15334) 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-12-07 | 11 | -0/+513 |
|\| | |||||
| * | [Keyboard] Add Eternal keypad (#15413) | Duccio | 2021-12-07 | 11 | -0/+513 |
| | | | | | | | | 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-12-07 | 16 | -652/+94 |
|\| | |||||
| * | [keyboard] Update lighting effects on XBows board (#15358) | X-Bows Tech | 2021-12-07 | 16 | -652/+94 |
| | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Shulin <mumu@x-bows.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-07 | 8 | -50/+31 |
|\| | |||||
| * | Iron180 LED fix (#15411) | Álvaro A. Volpato | 2021-12-07 | 8 | -50/+31 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-07 | 6 | -2/+54 |
|\| | |||||
| * | Extended Community Layout Support (#15371) | James Young | 2021-12-06 | 6 | -2/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add tkl_f13_ansi Community Layout * add tkl_f13_ansi_tsangan Community Layout * add tkl_f13_iso Community Layout * add tkl_f13_iso_tsangan Community Layout * add missing layout diagrams to readme.md * fix layout macro references in info.json files * add tkl_nofrow_iso Community Layout * enable Community Layout support: dyz/dyz_tkl * enable Community Layout support: kopibeng/mnk88 * enable Community Layout support: mechlovin/infinity88 * enable Community Layout support: tgr/jane/v2ce * tgr/jane/v2ce: rename/add layouts The ANSI Tsangan and ISO Tsangan layout macros did not note that Split Right Shift was supported. This commit notes the Split Right Shift in the macro name, and adds Tsangan layouts without Split Right Shift for ANSI and ISO, which fixes the Community Layout support. | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-07 | 11 | -0/+356 |
|\| | |||||
| * | [Keyboard] Add Albacore (#13200) | paprikman | 2021-12-06 | 11 | -0/+356 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-07 | 23 | -100/+1005 |
|\| | |||||
| * | [Keyboard] Update K type (#15405) | Andrew-Fahmy | 2021-12-06 | 14 | -109/+160 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
| * | [Keyboard] Add Mona v32a (#15412) | Ramon Imbao | 2021-12-06 | 10 | -0/+854 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-06 | 2 | -1/+9 |
|\| | |||||
| * | Add DFU Suffix for APM chips (#15414) | yiancar | 2021-12-06 | 2 | -1/+9 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-06 | 3 | -73/+137 |
|\| | |||||
| * | [Keymap] updates to own dactyl keymap (#14223) | Christian Eiden | 2021-12-06 | 3 | -73/+137 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-06 | 2 | -8/+9 |
|\| | |||||
| * | [Keyboard] Fix compilation issues for viktus smolka (#15410) | Drashna Jaelre | 2021-12-06 | 2 | -8/+9 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-06 | 11 | -0/+420 |
|\| | |||||
| * | [Keyboard] Add Viktus Smolka (#15346) | J.Flanagan | 2021-12-05 | 11 | -0/+420 |
| | | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> 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-12-06 | 1 | -1/+3 |
|\| | |||||
| * | [Keyboard] Fix bug in Moonlander functions (#15407) | Drashna Jaelre | 2021-12-05 | 1 | -1/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-06 | 1 | -0/+8 |
|\| | |||||
| * | [Keyboard] Update BM68RGB Caps Lock Backlight status indication (#13497) | SergioPoverony | 2021-12-05 | 1 | -0/+8 |
| | | | | | | Co-authored-by: Drashna Jael're <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-06 | 4 | -34/+30 |
|\| | |||||
| * | [Keyboard] Updated pins configuration and keymaps for Vaengr (#15379) | Vicktor Hutama | 2021-12-05 | 4 | -34/+30 |
| | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-02 | 2 | -4/+4 |
|\| | |||||
| * | Update ReadMe for the Roopad (#15380) | Wolf Van Herreweghe | 2021-12-02 | 2 | -4/+4 |
| | | |||||
* | | Tidy up existing i2c_master implementations (#15376) | Joel Challis | 2021-12-02 | 2 | -19/+6 |
| | | | | | | | | | | * Move chibios defines out of header * Make some avr defines internal | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-02 | 15 | -15/+0 |
|\| | |||||
| * | Remove pointless `CUSTOM_MATRIX = no` (#15383) | Ryan | 2021-12-02 | 15 | -15/+0 |
| | |