summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-0312-0/+1198
|\|
| * Added Epoch80 (#12307)kb-elmo2021-04-0312-0/+1198
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-04-032-77/+77
|\|
| * [CI] Format code according to conventions (#12468)github-actions[bot]2021-04-032-77/+77
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-033-24/+6
|\|
| * kingly_keys/ave: move RGBLight config to keyboard level (#12457)James Young2021-04-023-24/+6
| | | | | | QMK Configurator's API can't use the RGBLight configurator when it's defined at keymap level.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-033-3/+3
|\|
| * keymaps: fix kinesis default keymap progrm/reset keycode (#12429)Michael Stapelberg2021-04-023-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 developQMK Bot2021-04-031-1/+5
|\|
| * [Keymap] Fixing userspace `rverst` (#12422)Robert Verst2021-04-021-1/+5
| | | | | | Co-authored-by: Robert Verst <robert.verst@tobit.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-031-44/+15
|\|
| * [Keymap] Remove kc keymap from khord chocopad keymap (#12409)Dylan Khor2021-04-021-44/+15
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-033-2/+66
|\|
| * [Keyboard] Add GON NerD TKL VIA keymap (#12309)kaylanm2021-04-023-2/+66
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-039-0/+336
|\|
| * [Keyboard] Add pkb65 keyboard (#12230)MCKeebs2021-04-029-0/+336
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-033-2/+50
|\|
| * [Keyboard] KBD67 Hotswap VIA Support (#12351)MechMerlin2021-04-023-2/+50
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-039-0/+265
|\|
| * [Keyboard] Added wilba.tech WT70-JB (#12347)Wilba2021-04-029-0/+265
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-039-0/+298
|\|
| * [Keyboard] Added RAMA WORKS KARA (#12346)Wilba2021-04-029-0/+298
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-031-2/+2
|\|
| * [Keyboard] Update sixkeyboard VID/PID (#12345)jrdsgl2021-04-021-2/+2
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-031-70/+57
|\|
| * [Keymap] remove kc layout from levinson jyh keymap (#12301)Jason Yamada-Hanff2021-04-021-70/+57
| | | | | | Co-authored-by: Jason Yamada-Hanff <jyamada-hanff@chromologic.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-032-0/+69
|\|
| * [Keyboard] Added VIA support to dmqdesign/spin (#12300)adamkraus62021-04-022-0/+69
| | | | | | Co-authored-by: Kraus, Adam <adam.kraus@mines.sdsmt.edu>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-0314-0/+437
|\|
| * [Keyboard] Add FoldKB (#12255)Danny2021-04-0214-0/+437
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Big quantum_keycodes cleanup (#12249)Ryan2021-04-021-466/+417
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-039-0/+343
|\|
| * [Keyboard] Add Lumberjack keyboard (#12124)Paul James2021-04-029-0/+343
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-022-0/+59
|\|
| * [Keymap] for Ibm m122 (#11704)dsanchezseco2021-04-022-0/+59
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-0210-0/+582
|\|
| * [Keyboard] Add CherryB Studio Keyboards (#11475)Duong Anh2021-04-0210-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 developQMK Bot2021-04-021-1/+1
|\|
| * `qmk doctor`: Fix WSL /mnt check (#12466)Ryan2021-04-021-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-021-4/+9
|\|
| * qmk doctor: Display macOS and Windows versions, and add WSL warning for /mnt ↵Ryan2021-04-021-4/+9
| | | | | | | | (#12441)
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-011-1/+1
|\|
| * change BM68 RGB USB Device descriptor device name (#12418)peepeetee2021-03-311-1/+1
| | | | | | * change styling USB Device descriptor device name to reflect stylistic choices of the developer
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-315-1050/+2
|\|
| * Remove leftover old implementations of the lily58 split code. (#12442)Nick Brassel2021-04-015-1050/+2
| |
* | add kinesis/kint36 (#10171)Michael Stapelberg2021-03-3111-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 developQMK Bot2021-03-301-1/+1
|\|
| * Format code according to conventions (#12437)github-actions[bot]2021-03-311-1/+1
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-301-1/+1
|\|
| * Allow for clang-format up to v20. (#12407)Nick Brassel2021-03-311-1/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 22:11:13 +0000