Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-23 | 9 | -0/+378 |
|\ | |||||
| * | [Keyboard] Add Plywrks Lune (#17057) | Ramon Imbao | 2022-08-23 | 9 | -0/+378 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add Plywrks Lune * Add OLED functionality * Update keyboards/plywrks/lune/keymaps/default/keymap.c * Update keyboards/plywrks/lune/keymaps/via/keymap.c * Update keyboards/plywrks/lune/keymaps/via/keymap.c * Update keyboards/plywrks/lune/lune.c * Add the missing 2 layers in the keymap Also added a missing parenthesis in lune.c, and removed the oled_task_user in the default keymap. * Update keyboards/plywrks/lune/info.json * Update keyboards/plywrks/lune/info.json * Update keyboards/plywrks/lune/info.json * Update keyboards/plywrks/lune/config.h | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-23 | 7 | -0/+266 |
|\| | |||||
| * | [Keyboard] Add Clunker (#18141) | Kyle McCreery | 2022-08-23 | 7 | -0/+266 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-23 | 1 | -1/+1 |
|\| | |||||
| * | Use correct board files for cantor (#18144) | Joel Challis | 2022-08-23 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-23 | 4 | -5/+60 |
|\| | |||||
| * | [Keyboard] Enable VIA - ALF X1.1 (#18140) | Dave Rowe | 2022-08-22 | 4 | -5/+60 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-23 | 1 | -1/+10 |
|\| | |||||
| * | [Keyboard] add rgb animation handwired/swiftrax/glacier (#18121) | Brandon Claveria | 2022-08-22 | 1 | -1/+10 |
| | | | | | | | | Co-authored-by: swiftrax <swiftrax@github.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-22 | 1 | -10/+0 |
|\| | |||||
| * | Remove USB IDs and strings from `fungo/rev1` (#18133) | Ryan | 2022-08-22 | 1 | -10/+0 |
| | | |||||
* | | RESET -> QK_BOOT user keymaps (#17940) | Joel Challis | 2022-08-21 | 1407 | -1800/+1898 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-21 | 64 | -114/+152 |
|\| | |||||
| * | Move keyboard USB IDs and strings to data driven, pass 3 (#18111) | Ryan | 2022-08-21 | 64 | -114/+152 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-21 | 1 | -0/+132 |
|\| | |||||
| * | Add pcewing Speedo v3 keymap (#18118) | Paul Ewing | 2022-08-21 | 1 | -0/+132 |
| | | | | | | | | | | * Add pcewing Speedo v3 keymap * Add readme and code quality improvements | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-21 | 4 | -0/+81 |
|\| | |||||
| * | [Keymap] Add new keymap to nasu (#18024) | Mario Cadenas | 2022-08-21 | 4 | -0/+81 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-21 | 5 | -0/+130 |
|\| | |||||
| * | [Keyboard] Add ai macropad (#17722) | Louis Dalibard | 2022-08-20 | 5 | -0/+130 |
| | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Louis Dalibard <ontake@ontake.dev> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-20 | 3 | -0/+238 |
|\| | |||||
| * | added keymap for kprepublic/jj40:brdlf (#17961) | Abigail | 2022-08-20 | 3 | -0/+238 |
| | | | | | | | | | | * added keymap for kprepublic/jj40:brdlf | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-20 | 12 | -0/+872 |
|\| | |||||
| * | [Keyboard] Add yandrstudio/nz67v2 keyboard. (#17591) | JX | 2022-08-20 | 12 | -0/+872 |
| | | | | | | * add yr nz67v2 by jiaxin96 | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-20 | 1 | -29/+29 |
|\| | |||||
| * | Format code according to conventions (#18119) | QMK Bot | 2022-08-20 | 1 | -29/+29 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-20 | 11 | -0/+563 |
|\| | |||||
| * | add fungo keyboard (#17513) | bojiguard | 2022-08-20 | 11 | -0/+563 |
| | | | | | | by bojiguard | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-20 | 11 | -0/+331 |
|\| | |||||
| * | Add Nascent keyboard support. (#17824) | studiokestra | 2022-08-20 | 11 | -0/+331 |
| | | | | | | * Add nascent keyboard by studiokestra | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-20 | 29 | -0/+852 |
|\| | |||||
| * | [Keyboard] Add Zed65 (#17917) | mechlovin | 2022-08-20 | 29 | -0/+852 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | Drashna Jael're | 2022-08-20 | 352 | -373/+373 |
|\| | |||||
| * | RESET -> QK_BOOT keyboard readme (#18110) | Joel Challis | 2022-08-20 | 352 | -373/+373 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-20 | 2 | -0/+112 |
|\| | |||||
| * | [Keymap] Add joe_scotto keymap for CRKBD (#18103) | Joe Scotto | 2022-08-19 | 2 | -0/+112 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-20 | 1 | -0/+4 |
|\| | |||||
| * | [Keyboard] Fix compilation issues for keycapsss kimiko (#18112) | Drashna Jaelre | 2022-08-20 | 1 | -0/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-20 | 4 | -0/+84 |
|\| | |||||
| * | [Keymap] Add Miryoku keymap for Hillside family (#18087) | Davide Masserut | 2022-08-19 | 4 | -0/+84 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-20 | 19 | -0/+1164 |
|\| | |||||
| * | [Keyboard] Add aliceh66 pianoforte (#18081) | AliceH66 | 2022-08-19 | 19 | -0/+1164 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'upstream/master' into develop | fauxpark | 2022-08-20 | 550 | -1819/+1689 |
|\| | |||||
| * | Move keyboard USB IDs and strings to data driven, pass 2: S-Y (#18093) | Ryan | 2022-08-20 | 119 | -386/+351 |
| | | |||||
| * | Move keyboard USB IDs and strings to data driven, pass 2: M-O (#18090) | Ryan | 2022-08-20 | 146 | -452/+418 |
| | | |||||
| * | Move keyboard USB IDs and strings to data driven, pass 2: P-R (#18091) | Ryan | 2022-08-20 | 98 | -375/+282 |
| | | |||||
| * | Move keyboard USB IDs and strings to data driven, pass 2: J-L (#18080) | Ryan | 2022-08-20 | 187 | -602/+638 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-20 | 121 | -293/+309 |
|\| | |||||
| * | Move keyboard USB IDs and strings to data driven, pass 2: handwired (#18079) | Ryan | 2022-08-20 | 121 | -293/+309 |
| | |