summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-06Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-05MelGeek Mach80: correct Configurator layout (#14716)James Young
Adds a 0.5u gap between the top two rows.
2021-10-06Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-06Added semicolons to rules.mk to allow symlinks from /bin/sh to /bin/zsh to ↵remanifest
complete the filesize check without error. (#14718) Co-authored-by: John Beard <jbeard@pipelinerx.com>
2021-10-06Move Audio drivers from quantum to platform drivers folder (#14308)Drashna Jaelre
* Move Audio drivers from quantum to platform drivers folder * fix path for audio drivers Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-06Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-05[Bug] Fix command feature if mousekey is enabled and using 3-speed setting ↵Drashna Jaelre
(#14697)
2021-10-06Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-05[Keyboard] Add basic Keyhive Sofle support (#14296)Drashna Jaelre
Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
2021-10-05Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-05[Keymap] Some updates to mechmerlin userspace and keymaps (#14711)MechMerlin
2021-10-05Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-050xc7/61key touch-up (#14712)James Young
* correct Configurator layout data * rename LAYOUT to LAYOUT_60_ansi * correct info.json maintainer field Use the maintainer's GitHub username. * correct the compiling/flashing instructions Keyboard value is relative to `qmk_firmware/keyboards/`.
2021-10-05Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-05Durgod DGK6X Galaxy: correct Configurator layout (#14714)James Young
Top row had a y-value of 1, which placed it behind the number row when rendered.
2021-10-05Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-06More PR checklist updates (#14705)Nick Brassel
* Wording, clarification. * Apply suggestions from code review Co-authored-by: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com> Co-authored-by: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com>
2021-10-05Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-05Add clarification for licensing. (#14704)Nick Brassel
* Add clarification for licensing. * Errr, v2.
2021-10-05Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-04[Keyboard] Update Iris default keymap (#14701)Danny
2021-10-05Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-04[Keyboard] Added DC MC 001 (#14661)Daniel Cormier
2021-10-05Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-04[Keyboard] add dztech duo_s keyboard (#14625)moyi4681
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-10-04Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-04Document examples on intercepting Mod-Tap (#14502)Albert Y
Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> Co-authored-by: filterpaper <filterpaper@localhost>
2021-10-04Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-04Allow community layouts to be specified in info.json (#14682)Zach White
* move the community layout detection to python * fixup tests
2021-10-04Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-03[Keyboard] Add Iris Rev. 6 (#14683)Danny
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-03[Keyboard] Fix Mechlovin's Olly/BB keyboard matrix file (#14680)Drashna Jaelre
2021-10-03[Keyboard] Disable RGBLIGHT on mokey64 (#14681)Drashna Jaelre
2021-10-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-03[Keyboard] Add anti-ghosting support to Model M Converter (#14049)tiltowait
2021-10-03Add LM() keys to the list of keys disabled by NO_HAPTIC_MOD (#14181)Purdea Andrei
2021-10-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-03[Keyboard] Fix key routing for Keyprez Rhino ergo keys (#14589)Christian Sandven
2021-10-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-02[Keyboard] Adding kbnordic nordic60 (#14555)4pplet
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: 4pplet <4pplet@protonmail.com> Co-authored-by: 4pplet <stefan.ess@gmail.com>
2021-10-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-02[Keyboard] Add JP60 keyboard (#14219)ai03
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-02[Keyboard] Add Olly BB PCB (#14545)mechlovin
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-02[Keyboard] Modify mokey64 (#14612)rhmokey
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-02[Keymap] Updates to Personal Kyria Keymap (#14669)john-ezra
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-01[Keyboard] Enable Proton C defaults for SplitKB Kyria (#14490)Drashna Jaelre
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-02Merge remote-tracking branch 'origin/master' into developQMK Bot