Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into develop | fauxpark | 2021-07-03 | 39 | -553/+2280 |
|\ | |||||
| * | [Keymap] Think6.5v2 keymap with working caps-lock indicator (#12709) | Qiaowei Tang (Joel) | 2021-07-02 | 2 | -0/+241 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
| * | [Keymap] Update personal keymaps, add Corne keymap, and update non-kc LAYOUT ↵ | David Rambo | 2021-07-02 | 12 | -129/+593 |
| | | | | | | | | | | | | for Iris (#12273) Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
| * | [Keyboard] Add FnRow v1 keyboard by dinofizz (#11817) | Dino Fizzotti | 2021-07-02 | 13 | -0/+400 |
| | | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Dino Fizzotti <dinofizz@pop-os.localdomain> | ||||
| * | added 0xCB Static (#13047) | Conor Burns | 2021-07-02 | 10 | -0/+955 |
| | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
| * | correct info.json data (#13409) | James Young | 2021-07-02 | 1 | -424/+89 |
| | | |||||
| * | add maintainer value to info.json (#13411) | James Young | 2021-07-02 | 1 | -1/+1 |
| | | | | | | Configurator isn't using the data in this file, and I think this may be why... | ||||
* | | [Keyboard] Relocalize and Update p1800fl (#12425) | team0110 | 2021-07-02 | 12 | -56/+103 |
| | | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: marhalloweenvt <marhalloweenvt@gmail.com> Co-authored-by: Drashna Jael're <drashna@live.com> | ||||
* | | [Keyboard] manyboard macro (#11896) | William Ehman | 2021-07-02 | 9 | -0/+314 |
| | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-02 | 6 | -24/+19 |
|\| | |||||
| * | Fix up recent checkerboards additions (#13414) | Joel Challis | 2021-07-02 | 6 | -24/+19 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-02 | 1 | -1/+1 |
|\| | |||||
| * | [Bug] fix Dystopia.h comma (#13413) | Xelus22 | 2021-07-02 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-02 | 3 | -0/+0 |
|\| | |||||
| * | Cleanup gitignore (#13390) | Ryan | 2021-07-02 | 3 | -0/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-02 | 24 | -0/+851 |
|\| | |||||
| * | add support for Axon40 and G_IDB60 (#13075) | npspears | 2021-07-02 | 24 | -0/+851 |
| | | | | | | | | | | | | | | | | | | * add support for Axon40 * add support for G_IDB60 * added bootloader reset instructions * added bootloader reset instructions | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-01 | 1 | -355/+822 |
|\| | |||||
| * | Add missing Quefrency layouts for QMK Configurator (#13384) | Danny | 2021-07-01 | 1 | -355/+822 |
| | | | | | | | | | | * Reformat info.json using Prettier * Add missing layouts needed for QMK Configurators | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-01 | 3 | -2/+61 |
|\| | |||||
| * | [Keyboard] Adding Via support to the GON NerD60 (#13395) | AfterThought | 2021-07-01 | 3 | -2/+61 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-01 | 2 | -0/+39 |
|\| | |||||
| * | [Keymap] Add haervig userspace and keymaps (#13362) | Jakob Hærvig | 2021-07-01 | 2 | -0/+39 |
| | | |||||
* | | Convert Dip Switch callbacks to boolean functions (#13399) | Drashna Jaelre | 2021-07-01 | 33 | -52/+83 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-01 | 2 | -18/+18 |
|\| | |||||
| * | Changed Yeehaw Default Keymap (#13341) | Caleb Lightfoot | 2021-07-01 | 2 | -18/+18 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-01 | 8 | -17/+19 |
|\| | |||||
| * | Illusion Rosa: correct layout macro names (#13387) | James Young | 2021-07-01 | 8 | -17/+19 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-01 | 7 | -136/+135 |
|\| | |||||
| * | FJLabs Midway60: physically arrange layout macro and fix info.json data (#13386) | James Young | 2021-07-01 | 4 | -94/+93 |
| | | |||||
| * | Sanctified Dystopia: physically arrange layout macro (#13385) | James Young | 2021-07-01 | 3 | -42/+42 |
| | | | | | | Arranges the layout macro and keycodes to resemble the assembled keyboard. | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-01 | 3 | -6/+7 |
|\| | |||||
| * | Updates for keymap: ut472/stefanopace (#13370) | Stefano Pace | 2021-07-01 | 3 | -6/+7 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-01 | 2 | -4/+12 |
|\| | |||||
| * | [Keyboard] update debounce time on kint boards (#13351) | Michael Stapelberg | 2021-07-01 | 2 | -4/+12 |
| | | | | | | | | related to https://github.com/kinx-project/kint/issues/39 related to https://github.com/qmk/qmk_firmware/pull/12626 | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-01 | 1 | -36/+0 |
|\| | |||||
| * | [Keymap] RGB Timeout added to userspace (#13339) | stanrc85 | 2021-07-01 | 1 | -36/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-01 | 2 | -0/+2 |
|\| | |||||
| * | [Keyboard][Bug] Fix LED indicators on Skeletn87 (#13335) | kb-elmo | 2021-07-01 | 2 | -0/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-01 | 10 | -0/+426 |
|\| | |||||
| * | [Keyboard] Pteron36, open source 3x5_3 supporting layout (#13313) | Harshit Goel | 2021-07-01 | 10 | -0/+426 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-01 | 3 | -0/+206 |
|\| | |||||
| * | [Keymap] Create bingocaller keymap for DZ60RGB-ANSI (#13311) | Jesper Nellemann Jakobsen | 2021-07-01 | 3 | -0/+206 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Drashna's split updates (#13350) | Drashna Jaelre | 2021-07-01 | 33 | -816/+1366 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-01 | 10 | -0/+400 |
|\| | |||||
| * | [Keyboard] Added flygone60 rev3 (#13280) | Shandon Anderson | 2021-07-01 | 10 | -0/+400 |
| | | | | | | | | 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-07-01 | 5 | -7/+11 |
|\| | |||||
| * | [Keyboard] mb44 - Update info.json and encoder (#13244) | melonbred | 2021-07-01 | 5 | -7/+11 |
| | | |||||
* | | Remove `API_SYSEX_ENABLE`s from rules.mk (#13389) | Ryan | 2021-06-30 | 61 | -64/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-06-29 | 4 | -54/+117 |
|\| |