summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-01-18Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-01-18update the Chinese translation based on the latest English version (#14924)IskandarMa
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>
2022-01-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-01-17[Keyboard] fix odin rgb light error (#15914)moyi4681
2022-01-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-01-17Add LAYOUTS entry to rules.mk (#15900)Albert Y
* Add layouts to rules.mk * Remove excess settings. Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Joel Challis <git@zvecr.com>
2022-01-17CLI: Parse USB device version BCD (#14580)Ryan
* CLI: Parse USB device version BCD * Apply suggestions
2022-01-16Yet another bad `DEFAULT_FOLDER` fix. (#15904)Nick Brassel
2022-01-17move yd60mq to ymdk vendor folder (#15647)peepeetee
2022-01-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-01-17Revert "update keyboard_aliases.json (#15649)" (#15903)Nick Brassel
This reverts commit b24603ab7d5b731c7a09738cbfe0bce277559a47.
2022-01-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-01-17update keyboard_aliases.json (#15649)peepeetee
2022-01-17rename idobo to idobao/id75, move to vendor folder (#15661)peepeetee
* rename idobo to idobao/id75, move to vendor folder * add image, amend readme to id75 * add buying link
2022-01-17Add init function to clear previous effect (#15815)Albert Y
2022-01-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-01-15Fix dactyl manuform 6x6 LAYOUT_6x6_5_thumb rendering (#15891)Bartosz Nowak
2022-01-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-01-14[Keyboard] Fix compilation issues for mechlovin hex4b (#15885)Drashna Jaelre
2022-01-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-01-15[Bug] Remove config.h include in dynamic_keymap.c (#15886)Drashna Jaelre
2022-01-14[Keyboard] Add Rosaline (#15595)Paul James
2022-01-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-01-14[Keyboard] Add Devil68 Pro (#15820)HorrorTroll
2022-01-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-01-14[Keyboard] Fix encoder bug zoom65 and zoom65_litte (#15876)GG
2022-01-15Fix broken bootloader builds in develop. (#15880)Dasky
2022-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-01-14[Keymap] added keymap conor with rgb layers (#15234)Conor Burns
2022-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-01-14[Keyboard] Add Keychron_q1 rev_0101 and Keychron q2 series (#15025)lalalademaxiya1
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>
2022-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-01-14Make note of upper limit for `UC()` (#15870)Ryan
2022-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-01-14Remove network drive mapping comment for WSL (#15871)Ryan
2022-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-01-13[keyboard] Adding Atlas_65 (#15839)Ryan Smith
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-01-13[Keymap] ericgebhart keymap and userspace updates (#15727)Eric Gebhart
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>
2022-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-01-13[Keyboard] Add VIA support for the Drop Alt (#15857)asdfire1
2022-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-01-13[Keyboard] and CB87v2 and CB87RGB and fixed CB1800 and CB87 (#15824)DA
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2022-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-01-13[Keyboard] Fixing dactyl manuform 6x6 warnings (#15868)Bartosz Nowak
2022-01-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-01-13Fix keymap.json macro example (#15567)Tuk Bredsdorff
2022-01-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-01-13Adding Quefrency keymap (#15852)peott-fr
2022-01-13Merge remote-tracking branch 'origin/master' into developQMK Bot