Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-03 | 3 | -3/+3 |
|\ | |||||
| * | keymaps: fix kinesis default keymap progrm/reset keycode (#12429) | Michael Stapelberg | 2021-04-02 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | The right-most top-most key on the Kinesis Advantage keyboard is labeled “Progrm” and was meant to enter the Teensy bootloader as per the comment. However, the keycode was set to KC_1, which just produces a “1”. It should be RESET instead. This commit fixes KC_1 to RESET in all files where the fix is needed. The other files have already been fixed independently. | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-03 | 1 | -1/+5 |
|\| | |||||
| * | [Keymap] Fixing userspace `rverst` (#12422) | Robert Verst | 2021-04-02 | 1 | -1/+5 |
| | | | | | | Co-authored-by: Robert Verst <robert.verst@tobit.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-03 | 1 | -44/+15 |
|\| | |||||
| * | [Keymap] Remove kc keymap from khord chocopad keymap (#12409) | Dylan Khor | 2021-04-02 | 1 | -44/+15 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-03 | 3 | -2/+66 |
|\| | |||||
| * | [Keyboard] Add GON NerD TKL VIA keymap (#12309) | kaylanm | 2021-04-02 | 3 | -2/+66 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-03 | 9 | -0/+336 |
|\| | |||||
| * | [Keyboard] Add pkb65 keyboard (#12230) | MCKeebs | 2021-04-02 | 9 | -0/+336 |
| | | | | | | | | 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-04-03 | 3 | -2/+50 |
|\| | |||||
| * | [Keyboard] KBD67 Hotswap VIA Support (#12351) | MechMerlin | 2021-04-02 | 3 | -2/+50 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-03 | 9 | -0/+265 |
|\| | |||||
| * | [Keyboard] Added wilba.tech WT70-JB (#12347) | Wilba | 2021-04-02 | 9 | -0/+265 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-03 | 9 | -0/+298 |
|\| | |||||
| * | [Keyboard] Added RAMA WORKS KARA (#12346) | Wilba | 2021-04-02 | 9 | -0/+298 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-03 | 1 | -2/+2 |
|\| | |||||
| * | [Keyboard] Update sixkeyboard VID/PID (#12345) | jrdsgl | 2021-04-02 | 1 | -2/+2 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-03 | 1 | -70/+57 |
|\| | |||||
| * | [Keymap] remove kc layout from levinson jyh keymap (#12301) | Jason Yamada-Hanff | 2021-04-02 | 1 | -70/+57 |
| | | | | | | Co-authored-by: Jason Yamada-Hanff <jyamada-hanff@chromologic.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-03 | 2 | -0/+69 |
|\| | |||||
| * | [Keyboard] Added VIA support to dmqdesign/spin (#12300) | adamkraus6 | 2021-04-02 | 2 | -0/+69 |
| | | | | | | Co-authored-by: Kraus, Adam <adam.kraus@mines.sdsmt.edu> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-03 | 14 | -0/+437 |
|\| | |||||
| * | [Keyboard] Add FoldKB (#12255) | Danny | 2021-04-02 | 14 | -0/+437 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Big quantum_keycodes cleanup (#12249) | Ryan | 2021-04-02 | 1 | -466/+417 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-03 | 9 | -0/+343 |
|\| | |||||
| * | [Keyboard] Add Lumberjack keyboard (#12124) | Paul James | 2021-04-02 | 9 | -0/+343 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-02 | 2 | -0/+59 |
|\| | |||||
| * | [Keymap] for Ibm m122 (#11704) | dsanchezseco | 2021-04-02 | 2 | -0/+59 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-02 | 10 | -0/+582 |
|\| | |||||
| * | [Keyboard] Add CherryB Studio Keyboards (#11475) | Duong Anh | 2021-04-02 | 10 | -0/+582 |
| | | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-02 | 1 | -1/+1 |
|\| | |||||
| * | `qmk doctor`: Fix WSL /mnt check (#12466) | Ryan | 2021-04-02 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-02 | 1 | -4/+9 |
|\| | |||||
| * | qmk doctor: Display macOS and Windows versions, and add WSL warning for /mnt ↵ | Ryan | 2021-04-02 | 1 | -4/+9 |
| | | | | | | | | (#12441) | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-01 | 1 | -1/+1 |
|\| | |||||
| * | change BM68 RGB USB Device descriptor device name (#12418) | peepeetee | 2021-03-31 | 1 | -1/+1 |
| | | | | | | * change styling USB Device descriptor device name to reflect stylistic choices of the developer | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-03-31 | 5 | -1050/+2 |
|\| | |||||
| * | Remove leftover old implementations of the lily58 split code. (#12442) | Nick Brassel | 2021-04-01 | 5 | -1050/+2 |
| | | |||||
* | | add kinesis/kint36 (#10171) | Michael Stapelberg | 2021-03-31 | 11 | -2/+287 |
| | | | | | | | | | | This moves the config_common.h into the files that include ../config.h, so that the kint36/config.h does not include it (which would cause compilation errors). | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-03-30 | 1 | -1/+1 |
|\| | |||||
| * | Format code according to conventions (#12437) | github-actions[bot] | 2021-03-31 | 1 | -1/+1 |
| | | | | | | Co-authored-by: QMK Bot <hello@qmk.fm> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-03-30 | 1 | -1/+1 |
|\| | |||||
| * | Allow for clang-format up to v20. (#12407) | Nick Brassel | 2021-03-31 | 1 | -1/+1 |
| | | |||||
* | | core: add pin_defs for MK66F18 (#12419) | Michael Stapelberg | 2021-03-30 | 1 | -0/+81 |
| | | | | | | This is in preparation for https://github.com/qmk/qmk_firmware/pull/10171 | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-03-29 | 3 | -0/+113 |
|\| | |||||
| * | Added the 64_ansi (GK64) layout to DZ60 (#12378) | kb-elmo | 2021-03-28 | 3 | -0/+113 |
| | | | | | | | | | | | | * add gk64 layout * Apply suggestions from code review | ||||
* | | LED Matrix: Config functions (#12361) | Ryan | 2021-03-28 | 3 | -94/+104 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-03-27 | 1 | -1/+1 |
|\| | |||||
| * | add utf-8 encoding to the open() call (#12388) | Zach White | 2021-03-27 | 1 | -1/+1 |
| | |