summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-1510-114/+142
|\
| * [Keyboard] PloopyCo VIA updates (#11290)Drashna Jaelre2021-02-1410-114/+142
* | Merge branch 'master' into developJoshua Diamond2021-02-1414-25/+24
|\|
| * LED Matrix: rename `LED_DRIVER_LED_COUNT` to `DRIVER_LED_TOTAL` (#11858)Ryan2021-02-1514-25/+24
* | Merge branch 'develop' of github.com:qmk/qmk_firmware into developJoshua Diamond2021-02-142-5/+5
|\ \
| * | Format code according to conventions (#11907)github-actions[bot]2021-02-152-5/+5
* | | Merge branch 'master' into developJoshua Diamond2021-02-1465-829/+3360
|\ \ \ | |/ / |/| / | |/
| * [Keymap] Add MOC keymap for meishi2 (#11833)Atsushi NAGASE2021-02-143-0/+81
| * initial add S20 keyboard into polycarbdiet folder (#11865)Galib, Muhammad2021-02-149-0/+331
| * csc027/windows-terminal-shortcuts (#11867)csc0272021-02-142-5/+21
| * [Docs] Japanese translation of adc_driver.md (#10971)umi2021-02-141-0/+155
| * [Docs] Japanese translation of feature_unicode.md (#10985)umi2021-02-141-0/+277
| * [Keyboard] YMDK YMD40 v2 (#11835)James Young2021-02-1310-0/+324
| * [Keyboard] NEO Keys Palette G67 Hotswap & Soldered (#11850)James Young2021-02-1318-0/+1209
| * unscramble Durgod k320 keymap / fix Issue #11883 (#11885)Joshua Diamond2021-02-134-91/+79
| * LED Matrix: add led_matrix_types.h and implement g_led_config (#11741)Ryan2021-02-146-299/+302
| * Split gpio and atomic to platform (#11792)Joel Challis2021-02-1411-436/+580
* | Audio system overhaul (#11820)Drashna Jaelre2021-02-15113-2456/+9731
* | Add support for analog USBPD on STM32G4xx. (#11824)Nick Brassel2021-02-154-0/+133
* | Format code according to conventions (#11905)github-actions[bot]2021-02-155-27/+17
* | [CI] Format develop (#11893)Joel Challis2021-02-151-0/+4
* | ChibiOS conf upgrade for keebio/dsp40/rev1 (#11846)Nick Brassel2021-02-143-1380/+61
* | Refactor platform logic within print.h (#11863)Joel Challis2021-02-1417-280/+221
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-141-13/+0
|\|
| * Disable VIA protocol's EEPROM reset and bootloader jump commands (#11892)Nick Brassel2021-02-141-13/+0
* | bump to python 3.7 (#11408)Zach White2021-02-135-55/+23
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-137-1/+633
|\|
| * Add basic ISO {Win,Mac} layouts for Durgod/K320 (#11778)Al Cutter2021-02-137-1/+633
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-130-0/+0
|\|
| * Format code according to conventions (#11879)github-actions[bot]2021-02-130-0/+0
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-02-132-46/+46
|\|
| * Fix line endings for geminate60.[ch] (#11878)Ryan2021-02-122-46/+46
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-134-84/+88
|\|
| * [Keyboard] Update MOJO75 to support multi version (#11790)MelGeek2021-02-124-84/+88
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-132-2/+14
|\|
| * [Keyboard] tunks/ergo33: define RGBLight config at kb level (#11855)James Young2021-02-122-2/+14
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-121-1/+1
|\|
| * [Docs] Add EEP_RST keycode to "Wiping the EEPROM" section (#11830)Carlos2021-02-121-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-1211-0/+867
|\|
| * [Keyboard] geminate60 keyboard (#11670)Weirdo2021-02-1211-0/+867
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-122-0/+214
|\|
| * Adding custom keymap for Quark keyboard (#11744)Brian Marsh2021-02-122-0/+214
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-124-0/+419
|\|
| * Add stuartfong1 Planck Layout (#11814)Stuart Fong2021-02-124-0/+419
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-124-0/+0
|\|
| * Rename ki folder to kifinnsson (#11853)Christian Gurholt2021-02-124-0/+0
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-124-0/+421
|\|
| * added dear_vehicle_owner meme keymap to planck keyboard (#11478)Timothy Beck2021-02-124-0/+421
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-127-0/+273
|\|
| * [Keyboard] Add bastyl mini keyboard (#11782)Quentin2021-02-117-0/+273