summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-28Fixes #4072, #6214. Revision of #156 to clear before AS/TD. (#9941)Isaac Elenbaas
2021-02-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-27remove keyboard_folder from info.jsonZach White
2021-02-27Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-27Fix compile errors (#12048)Zach White
* fix compile errors * fix broken json files
2021-02-27Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-27Format code according to conventions (#12046)github-actions[bot]
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-02-27Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-28Fix build for attiny85-based boards. (#12044)Nick Brassel
2021-02-27Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-28Fix up build failures for melgeek boards after Feb27 develop merge. (#12043)Nick Brassel
2021-02-27Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-27Fix build for linworks/whale75. (#12042)Nick Brassel
2021-02-27Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-27Force update the version tagJames Young
2021-02-27Branch point for 2021 May 29 Breaking ChangeJames Young
2021-02-282021 February 27 Breaking Changes Update (#12040)Nick Brassel
2021-02-272021 February 27 Breaking Changes Changelog (#11975)James Young
* restore main readme.md * add ChangeLog entry for 2021-02-27 develop branch - initial version * update Docs; consolidate sidebar entries to new Breaking Changes History doc * Changelog update - concatenate similar changes as one list item - unify change formatting (remove [bracketed] headings and trailing periods) - item sorting improvement * update Changes Requiring User Action section Detail the changes regarding keyboard relocations/additions/deletions. * add entry for fauxpark's user keymap cleanup for config.h/rules.mk * add link to Jacky Studio bugfix PR * add link for "ChibiOS conf migrations... take 15" * add links for "Make LAYOUT parsing more robust" and "Massdrop develop rgb fix" * remove sort sequence numbers * rename Breaking Changes History page Renames the Breaking Changes History page to "Past Breaking Changes". * update schedule in Breaking Changes Overview * suggestions/changes per tzarc * skully's changes * add entry for "Fix develop" (PR 12039) Co-authored-by: Nick Brassel <nick@tzarc.org> Co-authored-by: Zach White <skullydazed@gmail.com>
2021-02-27Fix develop (#12039)Zach White
Fixes file encoding errors on Windows, and layouts not correctly merging into info.json. * force utf8 encoding * correctly merge layouts and layout aliases * show what aliases point to
2021-02-27Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-26[Keyboard] Evk v1.3 add a key (#11880)YangPiCui
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-27Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-26[Keyboard] Add VIA support to SX60 and update default keymap (#11908)Danny
2021-02-26Format code according to conventions (#12024)github-actions[bot]
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-02-26[BUG] Massdrop develop rgb fix (#12022)Nick Brassel
* Allow for disabling RGB_MATRIX on Massdrop boards. * Fixup init sequence. * Make some functions static as they've got very generic names.
2021-02-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-25[Keyboard] Fixup issues with Titan65 (#12002)Drashna Jaelre
* [Keyboard] Titan64 - Fix RGB Matrix config * Fix up keymaps
2021-02-25Merge remote-tracking branch 'upstream/master' into developfauxpark
2021-02-25V-USB suspend refactor (#11891)Ryan
2021-02-24make LAYOUT parsing more robustZach White
2021-02-25ChibiOS conf upgrade for daji/seis_cinco (#12001)Nick Brassel
daji/seis_cinco - f9ce55c07a61f20308dab7eb5f4f2b7a91686625
2021-02-24Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-24[Keyboard] Atlas alps/mx PCB addition (#11884)npspears
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-24Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-24[Keyboard] CapsUnlocked CU80 v2 (#11736)Rys Sommefeldt
Co-authored-by: Sergey Vlasov <sigprof@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Rys Sommefeldt <rys@pixeltards.com>
2021-02-23Merge remote-tracking branch 'origin/master' into developDrashna Jael're
2021-02-23[Keymap] Drashna Updates - Split+OLED edition (#11968)Drashna Jaelre
2021-02-23Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-23pill60 fix info.json to be used in configurator (#11979)Ikta
2021-02-22Bugfix for Jacky Studio keyboards (#11981)James Young
PR 10528 was intended to move the source for the Bear 65 and S7 Elephant to the new `jacky_studio` vendor directory. Instead of moving the source files, that PR added the source as if they were newly-supported. The result is that the Bear 65 and both revisions of the S7 Elephant have working, identical firmware in two different directories. This commit removes the source from the old directories.
2021-02-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-21[Keyboard] Disarray (#11583)SneakboxKB
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: mujimanic <64090325+mujimanic@users.noreply.github.com>
2021-02-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-21[Keyboard] Add Manibus keyboard and layout from Blank Tehnologii (#11832)Alex Paulescu
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-21[Keyboard] Tokyo Keyboard alix40 initial commit (#11918)James
Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: QuadCube <quadcube@QuadCube-Mac-mini.local>
2021-02-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-21[Keyboard] Add Daji Seis Cinco (#11955)toraifu
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-22Merge remote-tracking branch 'origin/master' into developQMK Bot
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-20 01:48:12 +0000