summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-03-04Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-04Dubba175 (#12077)drhigsby
* dubba175 initial * Following checklist * Update readme.md * Update keyboards/dubba175/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/dubba175/keymaps/default/keymap.c Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> * Update keyboards/dubba175/keymaps/default/keymap.c Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> * Update keyboards/dubba175/rules.mk Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> * Update config.h * Update keyboards/dubba175/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/dubba175/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/dubba175/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-04Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-05[Docs] Japanese translation of docs/keycodes.md (#10192)s-show
* copy 'keycodes.md'. * Translated 'keycodes.md'. * Fixed typo. * Fixed typo. * Apply suggestions from code review Co-authored-by: shela <shelaf@users.noreply.github.com> Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com> * update based on comment. * update based on comment. * Update docs/ja/keycodes.md * update based on comment. Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com> * update based on comment. Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com> * update based on comment. Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com> * Update docs/ja/keycodes.md Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com> * update based on comment. Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com> Co-authored-by: shela <shelaf@users.noreply.github.com> Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
2021-03-04Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-04`qmk generate-rules-mk`: add `--escape` switch for makefile logic (#12101)Ryan
2021-03-04Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-03[Keyboard] Add Studio Kestra Nue PCB (#12094)studiokestra
2021-03-03Remove ifdefs for Swap Hands keycodes (#12095)Drashna Jaelre
2021-03-04Fixup line endings.Nick Brassel
2021-03-03cannonkeys/atlas_alps: rename via keymaps rules.mk.txt to rules.mk (#12103)James Young
File doesn't work without the correct filename.
2021-03-03Format code according to conventions (#12102)github-actions[bot]
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-03-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-03[Keymap] sigma-squared (#11694)Signynt
2021-03-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-03Documentation changes SPLIT_USB_DETECT and hid_listen udev rules (#11665)individ-divided
Co-authored-by: David Grundberg <david@quartz>
2021-03-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-03[Keyboard] Add Conone 65 (#11827)Evelien-Lillian Dekkers
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-03[Keyboard] Add Keyboard Rartlite (#11866)labahuy
2021-03-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-03Update dichotomy/alairock layout (#12013)Skyler Lewis
2021-03-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-03[Keyboard] Added VIA folder under the keymaps folder (#12021)Angel Rojas
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-03[Keymap] Add grant24 Planck Rev 6 keymap (#12070)grant24
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-03[Keyboard] Enable RGB Matrix for Corne (#12091)Drashna Jaelre
2021-03-02Add support for complementary outputs to the WS2812 PWM driver (#11988)Sergey Vlasov
2021-03-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-02[Keymap] Add ddone's iris keymap (#12055)Ddone
2021-03-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-02[Docs] Small spelling mistake fix in leader keys (#12087)L3af
2021-03-03Format code according to conventions (#12088)github-actions[bot]
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-03-03Split RGB Matrix (#11055)XScorpion2
* Split RGB Matrix * Suspend State sync for rgb matrix
2021-03-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-02Remove more cruft from Lily58 default keymap (#12078)Dan Carroll
* Remove more cruft from lily58 default keymap * Update keyboards/lily58/keymaps/default/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update config.h Remove extra newline Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-03-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-02Set default for USB_SUSPEND_WAKEUP_DELAY to 0/disabled (#12081)Drashna Jaelre
2021-03-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-01[Docs] MATRIX_MASKED docs for SPLIT_HAND_MATRIX_GRID (#11974)Trevor Elliott
2021-03-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-01[Keyboard] Update eggman info.json (#12074)qpockets
attempting to fix qmk configurator issues
2021-03-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-02Fix the typo in ergodone 80 layout (#12075)Mega Mind
2021-03-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-02Revert "Fixing K-type RGB lighting (#11551)" (#12065)Nick Brassel
This reverts commit e6f7da403676b491ac278d5b793d18a0d114477e.
2021-03-01Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-01Fixing adjust layer issue with the lily58 default keymap (#12052)Dan Carroll
* Fix triggering of adjust layer in default lily58 keymap * Remove unused extern * Swap raise/lower in update_tri_layer_state call to match recommendation in PR checklist
2021-03-01Format code according to conventions (#12076)github-actions[bot]
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-03-01Add ability to toggle One Shot functionality (#4198)Drashna Jaelre
Co-authored-by: Nick Brassel <nick@tzarc.org> Co-authored-by: Ryan <fauxpark@gmail.com>