summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-061-175/+175
|\
| * MelGeek Mach80: correct Configurator layout (#14716)James Young2021-10-051-175/+175
| | | | | | Adds a 0.5u gap between the top two rows.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-061-2/+2
|\|
| * Added semicolons to rules.mk to allow symlinks from /bin/sh to /bin/zsh to ↵remanifest2021-10-061-2/+2
| | | | | | | | | | complete the filesize check without error. (#14718) Co-authored-by: John Beard <jbeard@pipelinerx.com>
* | Move Audio drivers from quantum to platform drivers folder (#14308)Drashna Jaelre2021-10-0610-10/+5
| | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-061-3/+3
|\|
| * [Bug] Fix command feature if mousekey is enabled and using 3-speed setting ↵Drashna Jaelre2021-10-051-3/+3
| | | | | | | | (#14697)
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-069-31/+385
|\|
| * [Keyboard] Add basic Keyhive Sofle support (#14296)Drashna Jaelre2021-10-059-31/+385
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-0515-55/+68
|\|
| * [Keymap] Some updates to mechmerlin userspace and keymaps (#14711)MechMerlin2021-10-0515-55/+68
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-055-16/+19
|\|
| * 0xc7/61key touch-up (#14712)James Young2021-10-055-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | * 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/`.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-051-16/+16
|\|
| * Durgod DGK6X Galaxy: correct Configurator layout (#14714)James Young2021-10-051-16/+16
| | | | | | Top row had a y-value of 1, which placed it behind the number row when rendered.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-051-13/+21
|\|
| * More PR checklist updates (#14705)Nick Brassel2021-10-061-13/+21
| | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-051-0/+22
|\|
| * Add clarification for licensing. (#14704)Nick Brassel2021-10-051-0/+22
| | | | | | | | | | * Add clarification for licensing. * Errr, v2.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-052-8/+8
|\|
| * [Keyboard] Update Iris default keymap (#14701)Danny2021-10-042-8/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-058-0/+227
|\|
| * [Keyboard] Added DC MC 001 (#14661)Daniel Cormier2021-10-048-0/+227
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-059-0/+269
|\|
| * [Keyboard] add dztech duo_s keyboard (#14625)moyi46812021-10-049-0/+269
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-041-0/+74
|\|
| * Document examples on intercepting Mod-Tap (#14502)Albert Y2021-10-041-0/+74
| | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-044-31/+21
|\|
| * Allow community layouts to be specified in info.json (#14682)Zach White2021-10-044-31/+21
| | | | | | | | | | * move the community layout detection to python * fixup tests
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-045-0/+227
|\|
| * [Keyboard] Add Iris Rev. 6 (#14683)Danny2021-10-035-0/+227
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-032-35/+36
|\|
| * [Keyboard] Fix Mechlovin's Olly/BB keyboard matrix file (#14680)Drashna Jaelre2021-10-031-34/+35
| |
| * [Keyboard] Disable RGBLIGHT on mokey64 (#14681)Drashna Jaelre2021-10-031-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-031-0/+3
|\|
| * [Keyboard] Add anti-ghosting support to Model M Converter (#14049)tiltowait2021-10-031-0/+3
| |
* | Add LM() keys to the list of keys disabled by NO_HAPTIC_MOD (#14181)Purdea Andrei2021-10-032-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-031-4/+4
|\|
| * [Keyboard] Fix key routing for Keyprez Rhino ergo keys (#14589)Christian Sandven2021-10-031-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-0212-0/+558
|\|
| * [Keyboard] Adding kbnordic nordic60 (#14555)4pplet2021-10-0212-0/+558
| | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-0214-0/+707
|\|
| * [Keyboard] Add JP60 keyboard (#14219)ai032021-10-0214-0/+707
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-0218-25/+789
|\|
| * [Keyboard] Add Olly BB PCB (#14545)mechlovin2021-10-0212-0/+754
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Modify mokey64 (#14612)rhmokey2021-10-026-25/+35
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-026-144/+851
|\|
| * [Keymap] Updates to Personal Kyria Keymap (#14669)john-ezra2021-10-026-144/+851
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keyboard] Enable Proton C defaults for SplitKB Kyria (#14490)Drashna Jaelre2021-10-0110-12/+162
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-022-115/+28
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-28 15:39:05 +0000