summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-09-01MatchstickWorks SouthPad: correct Configurator key sequence (#14255)James Young
* matchstickworks/southpad: correct Configurator key sequence * replace tabs with spaces; apply four-space indent
2021-09-01Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-01owl8: add info.json file (#14256)James Young
* owl8: add info.json file * remove width and height keys (per fauxpark) Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-01Fix typos from 14248 (#14261)Ryan
2021-09-01Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-01Fix snailmap compilation error (#14250)Jay Greco
* Fix snailmap compilation error * Update keymap.c with correct OLED_ENABLE defines
2021-09-01Change keyboard level include guards to `pragma once` (#14248)Ryan
* Change keyboard level include guards to `pragma once` And clean up a lot of layout macros * Oops * Remove dangling endif
2021-09-01Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-01mnk50: Configurator Fix and Layout Macro Additions (#14257)James Young
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-01Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-31[Keymap] cwebster2 Keymap and userspace updates (#14258)Casey Webster
2021-08-31Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-01Move GMMK Pro layouts to the correct subdir (#14241)Andre Brait
Also fix a compilation issue in the mike1808 keymap
2021-08-31Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-31[Keyboard] Disable console on Iris Rev5 (#14249)Drashna Jaelre
2021-08-31Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-31emi20: remove dead space from Configurator layout (#14254)James Young
2021-08-31Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-31[Keyboard] Add FJLabs KF87 PCB (#14179)Felix Jen
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-08-31Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-31[Keymap] reflects current rick's keymap (#14169)Ibnu Daru Aji
2021-08-31handwired/symmetric70_proto use post_rules.mk (#14235)Takeshi ISHII
2021-08-31[Keyboard] Helix use `post_rules.mk` (#14216)Takeshi ISHII
* Helix/pico use post_rules.mk insted of local_features.mk Tested with the following procedure. ``` git checkout 77a93fec79 (qmk/develop) make clean make helix/pico:all:check-md5 make helix/pico/sc:all:check-md5 git checkout helix_use_post_rules.mk make clean make helix/pico:all:check-md5 make helix/pico/sc:all:check-md5 ``` * Helix/rev2 use post_rules.mk Tested with the following procedure. ``` git checkout 77a93fec79 (qmk/develop) make clean make helix/pico:all:check-md5 make helix/pico/sc:all:check-md5 make helix/rev2:all:check-md5 make helix/rev2/sc:all:check-md5 git checkout helix_use_post_rules.mk make clean make helix/pico:all:check-md5 make helix/pico/sc:all:check-md5 make helix/rev2:all:check-md5 make helix/rev2/sc:all:check-md5 ```
2021-08-31Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-30[Keyboard] Addition of VIA keymap and a few fixes for naked60 (#14225)Salicylic-acid3
Co-authored-by: Joel Challis <git@zvecr.com>
2021-08-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-31cherry pick tidy up (#14244)Joel Challis
2021-08-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-31Documentation: Fix links in key overrides (#14228)coliss86
Co-authored-by: Joel Challis <git@zvecr.com>
2021-08-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-30Update ws2812_spi.c (#14237)JX
2021-08-30Move feature suspend logic out of platform specific code (#14210)Drashna Jaelre
2021-08-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-30[Keyboard] Add Iris Rev. 5 (#13934)Danny
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-30[Keymap] Add new snailmap keymap to nullbitsco/nibble keyboard (#14024)dogspace
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-30[Keyboard] Add OwLab Jelly Epoch (#14190)kb-elmo
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-30[Keyboard] add slamz keyboard (#14188)Rifaa Subekti
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-30[Bug] Fix build error when enabling NO_HAPTIC_MOD (#14178)Purdea Andrei
Without this build would fail, if a keyboard had haptic feedback enabled, TAPPING_TOGGLE was not overridden in a config.h, and if NO_HAPTIC_MOD was defined in config.h.
2021-08-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-30[Keyboard] add maker keyboards alexa (#14165)Felix Jen
2021-08-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-30[Keymap] Add peott-fr keymap for Kbd6x (#14164)peott-fr
2021-08-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-30[Keyboard] Changed ProductID on basketweav keyboards (#14162)Vincent Vorholter
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Vince Vorholter <vince@28east.co.za>
2021-08-29Remove bin/qmk (#14231)Zach White
* Remove the bin/qmk script * remove bin/qmk from workflows
2021-08-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-29ensure that the directory for sys.executable is in the user's path (#14229)Zach White
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 11:18:51 +0000