Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Relocate matrix_scan_quantum tasks (#15882) | Joel Challis | 2022-01-19 | 2 | -71/+72 | |
| | | | | | | | | | | | | | | * Move matrix_scan_quantum tasks * Fix tests * Fix up missing refs | |||||
* | | Add example implementations for compatible MCUs list (#15935) | Ryan | 2022-01-19 | 1 | -2/+13 | |
| | | | | | | | | | | | | | | | | | | * Add example implementations for compatible MCUs list * Update docs/compatible_microcontrollers.md Co-authored-by: Nick Brassel <nick@tzarc.org> Co-authored-by: Nick Brassel <nick@tzarc.org> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-19 | 2 | -10/+5 | |
|\| | ||||||
| * | Fixup build. (#15931) | Nick Brassel | 2022-01-19 | 2 | -10/+5 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-19 | 12 | -12/+0 | |
|\| | ||||||
| * | Remove `keyboard_folder` instances from `info.json` files (#15932) | James Young | 2022-01-19 | 12 | -12/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | * remove `keyboard_folder` instance from caffeinated/serpent65 * remove `keyboard_folder` instances from dumbpad * remove `keyboard_folder` instances from mlego directory * remove `keyboard_folder` instance from neopad/rev1 * remove `keyboard_folder` instance from spaceman/pancake/rev2 | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-18 | 51 | -1353/+3937 | |
|\| | ||||||
| * | update the Chinese translation based on the latest English version (#14924) | IskandarMa | 2022-01-18 | 51 | -1353/+3937 | |
| | | | | | | | | | | | | Co-authored-by: peepeetee <43021794+peepeetee@users.noreply.github.com> Co-authored-by: Joy Lee <chang.li@westberrytech.com> Co-authored-by: LitoMore <LitoMore@users.noreply.github.com> Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-17 | 1 | -1/+1 | |
|\| | ||||||
| * | [Keyboard] fix odin rgb light error (#15914) | moyi4681 | 2022-01-17 | 1 | -1/+1 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-17 | 6 | -2/+11 | |
|\| | ||||||
| * | Add LAYOUTS entry to rules.mk (#15900) | Albert Y | 2022-01-17 | 6 | -2/+11 | |
| | | | | | | | | | | | | | | | | | | * Add layouts to rules.mk * Remove excess settings. Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Joel Challis <git@zvecr.com> | |||||
* | | CLI: Parse USB device version BCD (#14580) | Ryan | 2022-01-17 | 42 | -52/+88 | |
| | | | | | | | | | | * CLI: Parse USB device version BCD * Apply suggestions | |||||
* | | Yet another bad `DEFAULT_FOLDER` fix. (#15904) | Nick Brassel | 2022-01-16 | 1 | -1/+1 | |
| | | ||||||
* | | move yd60mq to ymdk vendor folder (#15647) | peepeetee | 2022-01-17 | 19 | -7/+7 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-16 | 1 | -10/+4 | |
|\| | ||||||
| * | Revert "update keyboard_aliases.json (#15649)" (#15903) | Nick Brassel | 2022-01-17 | 1 | -10/+4 | |
| | | | | | | This reverts commit b24603ab7d5b731c7a09738cbfe0bce277559a47. | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-16 | 1 | -4/+10 | |
|\| | ||||||
| * | update keyboard_aliases.json (#15649) | peepeetee | 2022-01-17 | 1 | -4/+10 | |
| | | ||||||
* | | rename idobo to idobao/id75, move to vendor folder (#15661) | peepeetee | 2022-01-17 | 50 | -6/+11 | |
| | | | | | | | | | | | | | | * rename idobo to idobao/id75, move to vendor folder * add image, amend readme to id75 * add buying link | |||||
* | | Add init function to clear previous effect (#15815) | Albert Y | 2022-01-17 | 1 | -0/+4 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-15 | 1 | -3/+2 | |
|\| | ||||||
| * | Fix dactyl manuform 6x6 LAYOUT_6x6_5_thumb rendering (#15891) | Bartosz Nowak | 2022-01-15 | 1 | -3/+2 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-15 | 2 | -21/+4 | |
|\| | ||||||
| * | [Keyboard] Fix compilation issues for mechlovin hex4b (#15885) | Drashna Jaelre | 2022-01-14 | 2 | -21/+4 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-15 | 13 | -1/+512 | |
|\| | ||||||
| * | [Bug] Remove config.h include in dynamic_keymap.c (#15886) | Drashna Jaelre | 2022-01-15 | 1 | -1/+0 | |
| | | ||||||
| * | [Keyboard] Add Rosaline (#15595) | Paul James | 2022-01-14 | 12 | -0/+512 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-15 | 14 | -0/+758 | |
|\| | ||||||
| * | [Keyboard] Add Devil68 Pro (#15820) | HorrorTroll | 2022-01-14 | 14 | -0/+758 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-15 | 2 | -0/+6 | |
|\| | ||||||
| * | [Keyboard] Fix encoder bug zoom65 and zoom65_litte (#15876) | GG | 2022-01-14 | 2 | -0/+6 | |
| | | ||||||
* | | Fix broken bootloader builds in develop. (#15880) | Dasky | 2022-01-15 | 10 | -1/+17 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-14 | 3 | -0/+119 | |
|\| | ||||||
| * | [Keymap] added keymap conor with rgb layers (#15234) | Conor Burns | 2022-01-14 | 3 | -0/+119 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-14 | 63 | -136/+3255 | |
|\| | ||||||
| * | [Keyboard] Add Keychron_q1 rev_0101 and Keychron q2 series (#15025) | lalalademaxiya1 | 2022-01-14 | 63 | -136/+3255 | |
| | | | | | | | | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Cesar Rojas <cesar.fieoner@gmail.com> Co-authored-by: lokher <lokher@gmail.com> Co-authored-by: Adam Karim <adam@akarsoft.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-14 | 1 | -1/+1 | |
|\| | ||||||
| * | Make note of upper limit for `UC()` (#15870) | Ryan | 2022-01-14 | 1 | -1/+1 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-14 | 1 | -2/+0 | |
|\| | ||||||
| * | Remove network drive mapping comment for WSL (#15871) | Ryan | 2022-01-14 | 1 | -2/+0 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-14 | 10 | -0/+415 | |
|\| | ||||||
| * | [keyboard] Adding Atlas_65 (#15839) | Ryan Smith | 2022-01-13 | 10 | -0/+415 | |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-14 | 35 | -2001/+4223 | |
|\| | ||||||
| * | [Keymap] ericgebhart keymap and userspace updates (#15727) | Eric Gebhart | 2022-01-13 | 35 | -2001/+4223 | |
| | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> Co-authored-by: Drashna Jael're <drashna@live.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-14 | 2 | -0/+129 | |
|\| | ||||||
| * | [Keyboard] Add VIA support for the Drop Alt (#15857) | asdfire1 | 2022-01-13 | 2 | -0/+129 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-14 | 22 | -1/+802 | |
|\| | ||||||
| * | [Keyboard] and CB87v2 and CB87RGB and fixed CB1800 and CB87 (#15824) | DA | 2022-01-13 | 22 | -1/+802 | |
| | | | | | | | | 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 | 2022-01-14 | 2 | -11/+113 | |
|\| |