Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-28 | 98 | -368/+316 |
|\ | |||||
| * | Move keyboard USB IDs and strings to data driven: H (#17821) | Ryan | 2022-07-28 | 98 | -368/+316 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-28 | 6 | -163/+113 |
|\| | |||||
| * | feat: encoder map, OLED & encoder kb-level config (#17809) | Less/Rikki | 2022-07-28 | 6 | -163/+113 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-27 | 5 | -0/+254 |
|\| | |||||
| * | [Keymap] Add artflag kyria layout (#17778) | Arthur | 2022-07-27 | 5 | -0/+254 |
| | | | | | | | | | | | | | | | | | | * Initial firmware * feedback * updates * update map | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-27 | 100 | -367/+314 |
|\| | |||||
| * | Move keyboard USB IDs and strings to data driven: F (#17816) | Ryan | 2022-07-27 | 100 | -367/+314 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-27 | 3 | -43/+44 |
|\| | |||||
| * | Fix SKErgo Keymap (#17812) | Kevin Zhao | 2022-07-27 | 3 | -43/+44 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-27 | 84 | -315/+271 |
|\| | |||||
| * | Move keyboard USB IDs and strings to data driven: G (#17818) | Ryan | 2022-07-27 | 84 | -315/+271 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-27 | 1 | -1/+1 |
|\| | |||||
| * | fix function layer to reflect cap labels (#17813) | turbololvo | 2022-07-27 | 1 | -1/+1 |
| | | | | | | These changes correctly reflect the keycap labels on the Vortex Race 3. | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-27 | 19 | -91/+268 |
|\| | |||||
| * | Wuque Promise87 ANSI Refactor (#17807) | James Young | 2022-07-27 | 19 | -91/+268 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 2 | -4/+4 |
|\| | |||||
| * | [Keyboard] Fix typo with RGB LED positioning in Iris (#17805) | Danny | 2022-07-26 | 2 | -4/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 15 | -100/+74 |
|\| | |||||
| * | feat: encoder map, OLED & encoder kb-level config (#17767) | Less/Rikki | 2022-07-26 | 15 | -100/+74 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 11 | -0/+695 |
|\| | |||||
| * | [Keyboard] Add work louder micro (#17586) | Drashna Jaelre | 2022-07-26 | 11 | -0/+695 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] Add work louder micro * Update keyboards/work_louder/micro/readme.md * Update readme * Update kb config files * Update to use encoder map Co-authored-by: Tom Barnes <barnestom@me.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 4 | -0/+136 |
|\| | |||||
| * | Dz65v2 Settings for SBennett13 (#17747) | Scott Bennett | 2022-07-26 | 4 | -0/+136 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Start of dz65v2 map for sbennett13 * No wpm, disable some rgb, ~copyright~ * No more raindrops * Remove more rgb modes and set default * Almost orgot this crappy thing * cannot define startup :( * Layered esc is kc_grv * Start of dz65v2 map for sbennett13 * No wpm, disable some rgb, ~copyright~ * No more raindrops * Remove more rgb modes and set default * Almost orgot this crappy thing * cannot define startup :( * Layered esc is kc_grv * Add license to config and keymap | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 1 | -0/+55 |
|\| | |||||
| * | Add alternative Logos (#17787) | Spaceman | 2022-07-26 | 1 | -0/+55 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 9 | -0/+155 |
|\| | |||||
| * | Added WT65-D (#17724) | Wilba | 2022-07-26 | 9 | -0/+155 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 21 | -0/+777 |
|\| | |||||
| * | [Keyboard] Acheron Athena support (#16818) | Álvaro A. Volpato | 2022-07-26 | 21 | -0/+777 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | bastardkb: fix info.json changes that got reverted during the last merge ↵ | Charly Delay | 2022-07-26 | 4 | -21/+3 |
| | | | | | | | | | | | | | | from `master` to `develop` (#17800) * bastardkb: fix info.json changes that got reverted during the last merge from `master` to `develop` * Remove board name from root folder `info.json` | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 5 | -0/+404 |
|\| | |||||
| * | [Keymap] Add ollyhayes keymap (#16632) | Olly Hayes | 2022-07-25 | 5 | -0/+404 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 9 | -0/+214 |
|\| | |||||
| * | [Keyboard] add DJam keyboard (#17430) | Leo Deng | 2022-07-25 | 9 | -0/+214 |
| | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 11 | -0/+476 |
|\| | |||||
| * | [Keyboard] Add Halokeys Elemental 75 (#17323) | shamit05 | 2022-07-25 | 11 | -0/+476 |
| | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 9 | -0/+593 |
|\| | |||||
| * | [Keyboard] Add Kawayo Keyboard (#17454) | Cipulot | 2022-07-25 | 9 | -0/+593 |
| | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 10 | -0/+380 |
|\| | |||||
| * | [Keyboard] Add Star75 support (#17421) | hornslyn | 2022-07-25 | 10 | -0/+380 |
| | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | [Keyboard] Add RP2040 config defaults for ferris/sweep and cradio (#17557) | Albert Y | 2022-07-25 | 4 | -25/+13 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 1 | -229/+42 |
|\| | |||||
| * | takashicompany miniZone: fix QMK Configurator implementation (#17801) | James Young | 2022-07-25 | 1 | -229/+42 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 1 | -1/+1 |
|\| | |||||
| * | [Keyboard] Add missing mute button to sofle keymap (#17796) | Daniel O'Brien | 2022-07-25 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 1 | -5/+3 |
|\| | |||||
| * | Update README.md for teensy lc onekey (#17797) | Diogo Sergio | 2022-07-25 | 1 | -5/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-07-26 | 8 | -169/+57 |
|\| | |||||
| * | gboards/georgi: cleanup & fix (#17753) | Ryan | 2022-07-26 | 8 | -169/+57 |
| | |