summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-1311-0/+421
|\|
| * [Keymap] adding new keymap for the idobo keyboard with backlight (#13969)Path Nirvana2021-08-133-0/+71
| |
| * [Keyboard] Add dtisaac01 keyboard (#13967)Dao Tak Isaac2021-08-138-0/+350
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-137-0/+266
|\|
| * [Keyboard] Add Southpad Keyboard (#13964)Logan Butler2021-08-137-0/+266
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keyboard] Fixup Ungodly Launch Pad config (#13992)Drashna Jaelre2021-08-131-19/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-1312-0/+494
|\|
| * [Keyboard] Add the mini_elixivy keyboard (#13960)minibois2021-08-1312-0/+494
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-1313-0/+412
|\|
| * [Keyboard] Added Frooastboard (#13970)Simon2021-08-1311-0/+344
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Add Basketweave VIA keymap (#13972)Vincent Vorholter2021-08-132-0/+68
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Vince Vorholter <vince@28east.co.za>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-139-0/+412
|\|
| * [Keyboard] add rart75m with via support (#13975)Alabahuy2021-08-139-0/+412
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-131-2/+22
|\|
| * use sudo to install modules if needed (#13984)Zach White2021-08-131-2/+22
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-121-0/+35
|\|
| * Update 20210529.md (#13170)Felix Sargent2021-08-131-0/+35
| | | | | | This was confusing to me when I updated, so I want to make it more clear for those that come after.
* | Fix some additional bootmagic settings (#13979)Drashna Jaelre2021-08-123-3/+3
| |
* | [Keyboard] Fix default keymap for GMMK Pro Iso (#13980)Drashna Jaelre2021-08-131-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-122-2/+2
|\|
| * [Keyboard] Fix keymaps for Ocean Gin v2 (#13976)Drashna Jaelre2021-08-132-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-08-12128-1925/+5388
|\|
| * Update config.h for kbdfans/kbd67/mkiirgb/v3 (#13978)Vino Rodrigues2021-08-121-1/+1
| | | | | | QMK Configurator does not compile - needs a value on RGB_DISABLE_WHEN_USB_SUSPENDED
| * [Keymap] add kuatsure planck keymap (#10625)Jarrett Drouillard2021-08-127-13/+371
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Add Launch Pad keymaps (#12490)Luis Godinez2021-08-129-246/+923
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Update to customMK Genesis (#12511)David Hoelscher2021-08-1229-85/+764
| | | | | | Co-authored-by: Ray <ray@custommk.com>
| * [Keyboard] Add Spacey keyboard firmware (#12599)Vanilla2021-08-128-0/+357
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: tfjones24 <tannerfj24@gmail.com>
| * [Keyboard] Add Tripel keyboard (#12635)Paul James2021-08-1215-0/+429
| |
| * [Keyboard] Keyprez rhino (#13035)Christian Sandven2021-08-1212-0/+811
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Fix incorrect RGBLED_NUM value for kbd67 (#13166)Miles Flavel2021-08-120-0/+0
| |
| * [Keyboard] Add Skeletyl keyboard (#13495)Quentin2021-08-127-0/+320
| | | | | | | | | | Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keymap] JJerrell - Add Userspace and ZSA Keyboard Keymaps (#13548)Jacob Jerrell2021-08-1240-1575/+1399
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-129-0/+589
|\|
| * [Keyboard] Add EndZone34 (#13847)sato-takashi2021-08-129-0/+589
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-121-15/+41
|\|
| * Cospad Configurator touch-up (#13971)James Young2021-08-121-15/+41
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-129-0/+438
|\|
| * [Keyboard] Add Edda Keyboard (#13953)arnstadm2021-08-129-0/+438
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keymap] Add andrebrait layout for GMMK Pro (#13932)Andre Brait2021-08-128-3/+342
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-123-0/+325
|\|
| * [Keymap] Add lily58 datadavd layout (#13560)David Dansby2021-08-113-0/+325
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-129-0/+241
|\|
| * [Keyboard] add Gin V2 keyboard (#13943)Rifaa Subekti2021-08-119-0/+241
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-129-0/+247
|\|
| * [Keyboard] add Wang V2 keyboard (#13948)Rifaa Subekti2021-08-119-0/+247
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'upstream/master' into developJames Young2021-08-1131-146/+961
|\| | | | | | | | | | | | | | | | | Fixes merge conflicts in: - keyboards/poker87c/rules.mk and keyboards/poker87d/rules.mk - Conflicts from PR 13961 - keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c - Conflict from PR 13947
| * [Keyboard] Add Rune Vaengr Keyboard (#13945)Vicktor Hutama2021-08-1110-0/+449
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * initial commit * fixed layout * enabled NKRO * removed qmkbest * changed the pins and bootloader to the mcu version * updated readme * Apply suggestions from code review thank you @drashna Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Keyboard] Improvements to m122_3270 (#13947)jmaynard2021-08-116-14/+141
| | | | | | Co-authored-by: Jay Maynard <jmaynard@conmicro.com>
| * Poker87C and Poker87D Refactor (#13961)James Young2021-08-1112-120/+360
| |
| * Update USB Device strings for VIA identification (#13962)James Young2021-08-113-7/+7
| |