summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1912-12/+0
|\
| * Remove `keyboard_folder` instances from `info.json` files (#15932)James Young2022-01-1912-12/+0
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1851-1353/+3937
|\|
| * update the Chinese translation based on the latest English version (#14924)IskandarMa2022-01-1851-1353/+3937
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-171-1/+1
|\|
| * [Keyboard] fix odin rgb light error (#15914)moyi46812022-01-171-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-176-2/+11
|\|
| * Add LAYOUTS entry to rules.mk (#15900)Albert Y2022-01-176-2/+11
* | CLI: Parse USB device version BCD (#14580)Ryan2022-01-1742-52/+88
* | Yet another bad `DEFAULT_FOLDER` fix. (#15904)Nick Brassel2022-01-161-1/+1
* | move yd60mq to ymdk vendor folder (#15647)peepeetee2022-01-1719-7/+7
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-161-10/+4
|\|
| * Revert "update keyboard_aliases.json (#15649)" (#15903)Nick Brassel2022-01-171-10/+4
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-161-4/+10
|\|
| * update keyboard_aliases.json (#15649)peepeetee2022-01-171-4/+10
* | rename idobo to idobao/id75, move to vendor folder (#15661)peepeetee2022-01-1750-6/+11
* | Add init function to clear previous effect (#15815)Albert Y2022-01-171-0/+4
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-151-3/+2
|\|
| * Fix dactyl manuform 6x6 LAYOUT_6x6_5_thumb rendering (#15891)Bartosz Nowak2022-01-151-3/+2
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-152-21/+4
|\|
| * [Keyboard] Fix compilation issues for mechlovin hex4b (#15885)Drashna Jaelre2022-01-142-21/+4
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1513-1/+512
|\|
| * [Bug] Remove config.h include in dynamic_keymap.c (#15886)Drashna Jaelre2022-01-151-1/+0
| * [Keyboard] Add Rosaline (#15595)Paul James2022-01-1412-0/+512
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1514-0/+758
|\|
| * [Keyboard] Add Devil68 Pro (#15820)HorrorTroll2022-01-1414-0/+758
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-152-0/+6
|\|
| * [Keyboard] Fix encoder bug zoom65 and zoom65_litte (#15876)GG2022-01-142-0/+6
* | Fix broken bootloader builds in develop. (#15880)Dasky2022-01-1510-1/+17
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-143-0/+119
|\|
| * [Keymap] added keymap conor with rgb layers (#15234)Conor Burns2022-01-143-0/+119
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1463-136/+3255
|\|
| * [Keyboard] Add Keychron_q1 rev_0101 and Keychron q2 series (#15025)lalalademaxiya12022-01-1463-136/+3255
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-141-1/+1
|\|
| * Make note of upper limit for `UC()` (#15870)Ryan2022-01-141-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-141-2/+0
|\|
| * Remove network drive mapping comment for WSL (#15871)Ryan2022-01-141-2/+0
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1410-0/+415
|\|
| * [keyboard] Adding Atlas_65 (#15839)Ryan Smith2022-01-1310-0/+415
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1435-2001/+4223
|\|
| * [Keymap] ericgebhart keymap and userspace updates (#15727)Eric Gebhart2022-01-1335-2001/+4223
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-142-0/+129
|\|
| * [Keyboard] Add VIA support for the Drop Alt (#15857)asdfire12022-01-132-0/+129
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1422-1/+802
|\|
| * [Keyboard] and CB87v2 and CB87RGB and fixed CB1800 and CB87 (#15824)DA2022-01-1322-1/+802
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-142-11/+113
|\|
| * [Keyboard] Fixing dactyl manuform 6x6 warnings (#15868)Bartosz Nowak2022-01-132-11/+113
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-131-1/+1
|\|
| * Fix keymap.json macro example (#15567)Tuk Bredsdorff2022-01-131-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-131-0/+80
|\|