summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-162-0/+49
|\
| * adding tw40 via support (#13032)lukeski142021-07-172-0/+49
* | Move `SENDSTRING_BELL` code to `send_string.h` (#13566)Ryan2021-07-162-3/+8
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-1625-22/+1134
|\|
| * [Keyboard] Neito + my DZ60 keymap tweaks (#11773)Oliver Granlund2021-07-1625-22/+1134
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-161-5/+3
|\|
| * Remove unwanted notes (#13563)shela2021-07-161-5/+3
* | Fix LED Hit Counter for LED/RGB Matrix (#12674)Johannes Choo2021-07-162-2/+2
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-165-114/+54
|\|
| * Migrate arm_atsam print logic to use common framework (#13554)Joel Challis2021-07-165-114/+54
* | Use string literals for `SERIAL_NUMBER` (#13403)Ryan2021-07-163-4/+8
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-161-4/+0
|\|
| * remove `#include "rgblight.h"` when `defined(RGB_MATRIX_ENABLE)` from quantum...Takeshi ISHII2021-07-161-4/+0
* | Merge remote-tracking branch 'upstream/master' into developNick Brassel2021-07-161-0/+8
|\|
| * Set some default configurations for GMMK Pro (#13219)Andre Brait2021-07-161-0/+9
* | Dual RGB Matrix IS31FL3737 driver support to address #13442 (#13457)Chris Cullin2021-07-153-29/+54
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-152-56/+59
|\|
| * [Keyboard] correct the info.json for qmk configurator and add two empty layer...bomb2021-07-152-56/+59
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-1518-0/+1440
|\|
| * [keyboard] Clueboard 2x1800 2021 Support (#13220)Zach White2021-07-1418-0/+1440
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-1413-1/+764
|\|
| * [Keyboard] Add Serratus PCB (#13281)mechlovin2021-07-1413-1/+764
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-149-0/+370
|\|
| * [Keyboard] Tidying up my projects and subprojects (#13289)Koobaczech2021-07-149-0/+370
* | Migrate more `fn_actions` stuff (#13502)Ryan2021-07-1517-791/+497
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-142-3/+3
|\|
| * Fix some RGB Matrix-enabled keymaps referring to RGBLight mode (#13509)Ryan2021-07-152-3/+3
* | 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