summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2021-10-01[Keyboard] Convert ZSA's Moonlander keyboard to matrix lite (#14667)Drashna Jaelre
2021-10-01Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-02Add FIRMWARE_FORMAT = hex for /keyboards/kinesis/kint36 and ↵negatv
/keyboards/kinesis/kint41 (#14665) * Specify hex as the default FIRMWARE_FORMAT which is copied to qmk_firmware root folder * Specify hex as the default FIRMWARE_FORMAT which is copied to qmk_firmware root folder Co-authored-by: sadkins <sadkins@iMac-Pro.local>
2021-10-01Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-01[Docs] update Japanese translation of mod_tap.md (#13981)umi
* update mod_tap.md translation * add id on config_options.md and update text based on comments
2021-09-30Change `MK66F18` -> `MK66FX1M0` (#14659)Ryan
2021-09-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-01Fix documentation for NO_HAPTIC_MOD and NO_HAPTIC_FN features. (#14180)Purdea Andrei
2021-09-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-30Quark_LP- change MCU and RGB (#14650)npspears
2021-09-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-30Remove firmware size impact notes from <keyboard>/rules.mk (#14652)James Young
2021-09-30Merge remote-tracking branch 'origin/master' into developQMK Bot