Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Added semicolons to rules.mk to allow symlinks from /bin/sh to /bin/zsh to ↵ | remanifest | 2021-10-06 | 1 | -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 Jaelre | 2021-10-06 | 10 | -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 develop | QMK Bot | 2021-10-06 | 1 | -3/+3 | |
|\| | ||||||
| * | [Bug] Fix command feature if mousekey is enabled and using 3-speed setting ↵ | Drashna Jaelre | 2021-10-05 | 1 | -3/+3 | |
| | | | | | | | | (#14697) | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-06 | 9 | -31/+385 | |
|\| | ||||||
| * | [Keyboard] Add basic Keyhive Sofle support (#14296) | Drashna Jaelre | 2021-10-05 | 9 | -31/+385 | |
| | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Sergey Vlasov <sigprof@gmail.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-05 | 15 | -55/+68 | |
|\| | ||||||
| * | [Keymap] Some updates to mechmerlin userspace and keymaps (#14711) | MechMerlin | 2021-10-05 | 15 | -55/+68 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-05 | 5 | -16/+19 | |
|\| | ||||||
| * | 0xc7/61key touch-up (#14712) | James Young | 2021-10-05 | 5 | -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 develop | QMK Bot | 2021-10-05 | 1 | -16/+16 | |
|\| | ||||||
| * | Durgod DGK6X Galaxy: correct Configurator layout (#14714) | James Young | 2021-10-05 | 1 | -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 develop | QMK Bot | 2021-10-05 | 1 | -13/+21 | |
|\| | ||||||
| * | More PR checklist updates (#14705) | Nick Brassel | 2021-10-06 | 1 | -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 develop | QMK Bot | 2021-10-05 | 1 | -0/+22 | |
|\| | ||||||
| * | Add clarification for licensing. (#14704) | Nick Brassel | 2021-10-05 | 1 | -0/+22 | |
| | | | | | | | | | | * Add clarification for licensing. * Errr, v2. | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-05 | 2 | -8/+8 | |
|\| | ||||||
| * | [Keyboard] Update Iris default keymap (#14701) | Danny | 2021-10-04 | 2 | -8/+8 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-05 | 8 | -0/+227 | |
|\| | ||||||
| * | [Keyboard] Added DC MC 001 (#14661) | Daniel Cormier | 2021-10-04 | 8 | -0/+227 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-05 | 9 | -0/+269 | |
|\| | ||||||
| * | [Keyboard] add dztech duo_s keyboard (#14625) | moyi4681 | 2021-10-04 | 9 | -0/+269 | |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-04 | 1 | -0/+74 | |
|\| | ||||||
| * | Document examples on intercepting Mod-Tap (#14502) | Albert Y | 2021-10-04 | 1 | -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 develop | QMK Bot | 2021-10-04 | 4 | -31/+21 | |
|\| | ||||||
| * | Allow community layouts to be specified in info.json (#14682) | Zach White | 2021-10-04 | 4 | -31/+21 | |
| | | | | | | | | | | * move the community layout detection to python * fixup tests | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-04 | 5 | -0/+227 | |
|\| | ||||||
| * | [Keyboard] Add Iris Rev. 6 (#14683) | Danny | 2021-10-03 | 5 | -0/+227 | |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-03 | 2 | -35/+36 | |
|\| | ||||||
| * | [Keyboard] Fix Mechlovin's Olly/BB keyboard matrix file (#14680) | Drashna Jaelre | 2021-10-03 | 1 | -34/+35 | |
| | | ||||||
| * | [Keyboard] Disable RGBLIGHT on mokey64 (#14681) | Drashna Jaelre | 2021-10-03 | 1 | -1/+1 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-03 | 1 | -0/+3 | |
|\| | ||||||
| * | [Keyboard] Add anti-ghosting support to Model M Converter (#14049) | tiltowait | 2021-10-03 | 1 | -0/+3 | |
| | | ||||||
* | | Add LM() keys to the list of keys disabled by NO_HAPTIC_MOD (#14181) | Purdea Andrei | 2021-10-03 | 2 | -0/+2 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-03 | 1 | -4/+4 | |
|\| | ||||||
| * | [Keyboard] Fix key routing for Keyprez Rhino ergo keys (#14589) | Christian Sandven | 2021-10-03 | 1 | -4/+4 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-02 | 12 | -0/+558 | |
|\| | ||||||
| * | [Keyboard] Adding kbnordic nordic60 (#14555) | 4pplet | 2021-10-02 | 12 | -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 develop | QMK Bot | 2021-10-02 | 14 | -0/+707 | |
|\| | ||||||
| * | [Keyboard] Add JP60 keyboard (#14219) | ai03 | 2021-10-02 | 14 | -0/+707 | |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-02 | 18 | -25/+789 | |
|\| | ||||||
| * | [Keyboard] Add Olly BB PCB (#14545) | mechlovin | 2021-10-02 | 12 | -0/+754 | |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
| * | [Keyboard] Modify mokey64 (#14612) | rhmokey | 2021-10-02 | 6 | -25/+35 | |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-02 | 6 | -144/+851 | |
|\| | ||||||
| * | [Keymap] Updates to Personal Kyria Keymap (#14669) | john-ezra | 2021-10-02 | 6 | -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 Jaelre | 2021-10-01 | 10 | -12/+162 | |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-02 | 2 | -115/+28 | |
|\| | ||||||
| * | [Keyboard] Convert ZSA's Moonlander keyboard to matrix lite (#14667) | Drashna Jaelre | 2021-10-01 | 2 | -115/+28 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-01 | 2 | -0/+6 | |
|\| | ||||||
| * | Add FIRMWARE_FORMAT = hex for /keyboards/kinesis/kint36 and ↵ | negatv | 2021-10-02 | 2 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | /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> |