summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-012-7/+12
|\
| * [Docs] update Japanese translation of mod_tap.md (#13981)umi2021-10-012-7/+12
* | Change `MK66F18` -> `MK66FX1M0` (#14659)Ryan2021-09-305-5/+6
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-301-2/+8
|\|
| * Fix documentation for NO_HAPTIC_MOD and NO_HAPTIC_FN features. (#14180)Purdea Andrei2021-10-011-2/+8
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-301-2/+2
|\|
| * Quark_LP- change MCU and RGB (#14650)npspears2021-09-301-2/+2
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-3059-178/+178
|\|
| * Remove firmware size impact notes from <keyboard>/rules.mk (#14652)James Young2021-09-3059-178/+178
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-3054-57/+1
|\|
| * Remove redundant `MIDI_ENABLE = no` in keyboard-level rules.mk (#14649)Ryan2021-09-3054-57/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-304-16/+359
|\|
| * Mechlovin Hex4B: extend layout support (#14651)James Young2021-09-304-16/+359
* | Merge remote-tracking branch 'upstream/master' into developJames Young2021-09-29540-552/+0
|\|
| * Remove redundant `UNICODE_ENABLE = no` in keyboard-level rules.mk (#14633)Ryan2021-09-30541-553/+0
* | massdrop alt/ctrl: support saving into nvm (#6068)Alexandre d'Alton2021-09-301-4/+90
* | Added power tracking api (#12691)Purdea Andrei2021-09-306-2/+120
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-295-30/+236
|\|
| * Mechlovin Hannah60RGB touch-up (#14646)James Young2021-09-295-30/+236
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2911-30/+24
|\|
| * [Core] Fix "6kro enable" and clarify naming (#14563)Drashna Jaelre2021-09-2911-30/+24
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-296-51/+180
|\|
| * [Keymap] Update to Drashna Code (#14644)Drashna Jaelre2021-09-296-51/+180
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2921-9/+673
|\|
| * [Keyboard] add support for Quark_LP (#14552)npspears2021-09-2915-0/+610
| * [Keyboard] Update Grandiceps to Rev2 (#14618)vattern2021-09-296-9/+63
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-295-34/+216
|\|
| * [Keymap] Jonavin murphpad keymap update (#14637)jonavin2021-09-295-34/+216
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2912-10/+261
|\|
| * [Keyboard] Updates for Tractyl Manuform config (#14641)Drashna Jaelre2021-09-2912-10/+261
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-291-26/+26
|\|
| * [Keyboard] Fix end of file issue for Owlab suit80 (#14640)Drashna Jaelre2021-09-291-26/+26
* | [Keyboard] Add support for PaladinPad, Arya pcb and move keyboards by KapCave...nachie2021-09-2865-120/+1504
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-294-0/+119
|\|
| * [Keymap] Keychron Q1 user keymap (#14636)Grayson Carr2021-09-284-0/+119
* | Fix for mechlovin/adelais/standard_led/arm/rev4 (#14639)James Young2021-09-281-2/+2
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-281-1/+1
|\|
| * convert checkerboards/quark_squared:via rules.mk to Unix line endings (#14638)James Young2021-09-281-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-283-4/+72
|\|
| * Mechlovin Delphine: add LAYOUT_numpad_6x4 (#14635)James Young2021-09-283-4/+72
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-282-1/+2
|\|
| * Move "firmware size check skipped" note to message.mk (#14632)Ryan2021-09-292-1/+2
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-289-190/+213
|\|
| * [Keymap] fix NKRO - switch to get_mods() and refactor encoder action code (#1...jonavin2021-09-289-190/+213
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-285-12/+187
|\|
| * [Keyboard] Yampad VIA support (#14397)Greg Knapp2021-09-285-12/+187
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2818-0/+789
|\|
| * [Keyboard] Add OwLab Suit80 (#14362)owlab-git2021-09-2818-0/+789
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-282-2/+6
|\|
| * [Keymap] arkag userspace/keymap -- new macro and minor preonic keymap change ...Alexander Kagno2021-09-282-2/+6