summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developZach White2021-07-14168-1453/+10346
|\
| * switch to qmk-dotty-dict (#13460)Zach White2021-07-142-1/+2
| * correct data info.json (#13544)mechlovin2021-07-142-2/+2
| * [Keyboard] Add MelGeek MJ6xy which is a 60% keyboard that support mul… (#13...bomb2021-07-1459-0/+6118
| * Traveller handwired layout macro refactor (#13539)James Young2021-07-133-126/+129
| * Lucid Phantom soldered: layout macro touch-up (#13540)James Young2021-07-133-31/+30
| * RGB Matrix support for Scylla (#13415)Albert Y2021-07-133-3/+68
| * Refactor Drop boards to custom matrix lite (#13468)Joel Challis2021-07-134-286/+74
| * [Keyboard] Add ianklug grooveboard (#13536)Ian Klug2021-07-1311-0/+337
| * [Keyboard} Add ISO support for the GMMK Pro (#13532)Anton2021-07-133-0/+197
| * Ortho 5x14 handwired info.json correction (#13538)James Young2021-07-132-2/+2
| * 4pplet AEKISO60 keymap/macro touch-up (#13528)James Young2021-07-133-48/+60
| * Ergoarrows info.json touch-up (#13537)James Young2021-07-131-79/+91
| * [Keyboard] Montex add VIA support and keymap. (#13488)AnthonyL2021-07-133-1/+55
| * [Keyboard] fixes and additions to the Marauder keyboard (#13462)Cosmin2021-07-137-10/+265
| * AMJ60 Refactor (#13530)James Young2021-07-1313-471/+563
| * [Keyboard] Update Symmetric70 keyboard prototype (#12707)Takeshi ISHII2021-07-1335-64/+1865
| * 1UP Keyboards 1UP60HTE layout macro touch-up (#13529)James Young2021-07-137-100/+242
| * Ergonomic Vertical Keyboard (EVK) handwired info.json touch-up (#13527)James Young2021-07-121-92/+97
| * Checker Boards NOP60 touch-up (#13526)James Young2021-07-126-16/+156
* | [Feature] Key Overrides (#11422)Jonas Gessner2021-07-1314-3/+984
* | Keyboards/sol rev2 fix (#13533)XScorpion22021-07-131-9/+19
* | Change the prototype of matrix_output_unselect_delay() (#13045)Takeshi ISHII2021-07-133-4/+7
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-126-30/+36
|\|
| * ID67 codebase touch-up (#13521)James Young2021-07-126-30/+36
* | [Keymap] add simple gmmk pro macos keymap with rgb (#13504)Alex Marmon2021-07-122-0/+73
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-123-4/+61
|\|
| * [Keyboard] RGB Matrix support for TBK Mini (#13506)Albert Y2021-07-123-4/+61
* | Enable g_is31_leds PROGMEM for RGB Matrix IS31FL3737 driver (#13480)Chris Cullin2021-07-125-24/+30
* | Fix two out of bounds accesses from #13330. (#13525)Joakim Tufvegren2021-07-121-2/+2
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-1213-0/+422
|\|
| * [Keyboard] Add Bloop65 (#13388)Kwabena Aduse-Poku2021-07-1213-0/+422
* | Unify matrix for split common and regular matrix (#13330)Drashna Jaelre2021-07-113-353/+126
* | Matrix consistency check (#13470)Zach White2021-07-111-0/+46
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-119-10/+225
|\|
| * [Keyboard] Update lazydesigners/the60/rev2/rev2.h (#13505)jackytrabbit2021-07-111-10/+10
| * [Keyboard] CapsUnlocked CU7 (#13429)Rys Sommefeldt2021-07-118-0/+215
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-111-0/+1
|\|
| * [Keymap] Fix Corne Via Layout properly (#13518)Drashna Jaelre2021-07-111-0/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-1113-292/+297
|\|
| * [Keyboard] Wuque Studio Ikki68 Aurora codebase touch-up (#13510)James Young2021-07-1113-292/+297
* | first pass: matrix consistency improvements (#13471)Zach White2021-07-1122-28/+28
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-111-0/+3
|\|
| * Fixed the Helix keymap 'fraanrosi' compile issues (#13514)Takeshi ISHII2021-07-111-0/+3
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-113-182/+233
|\|
| * [Keymap] plattfot - Keymap updates for Kyria (#13449)Fredrik Salomonsson2021-07-103-182/+233
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-1129-0/+1292
|\|
| * [Keyboard] add new firewave ikki68_aurora (#13364)GG2021-07-1029-0/+1292
* | CLI: Add git and venv info to doctor's output (#13405)Erovia2021-07-103-8/+111
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-102-0/+0
|\|