summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-09-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-02Yoichiro Lunakey Macro: correct Configurator key sequence (#14276)James Young
* apply human-friendly formatting to info.json * correct Configurator key sequence
2021-09-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-01[Keymap] new murphpad landscape keymap with encoder enhanced functions (#14103)jonavin
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Jonavin <=>
2021-09-01[Keymap] Fine-tuning Nyquist keymap. (#14269)peott-fr
2021-09-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-01[Keymap] Fix Drashna Keymap issues missed before Develop merge (#14271)Drashna Jaelre
2021-09-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-01naiping/np64: 64_ansi Community Layout support and codebase touch-up (#14264)James Young
2021-09-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-01neson design/n6: Extended Community Layout Support and Layout Macro Fix (#14266)James Young
2021-09-01wuque/serneity65: Layout Macro rework and Configurator fix (#14267)James Young
2021-09-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-01[Keymap] hvp keymap for Cornelius, updated ut47.2 and userspace (#14187)hvp
2021-09-01[Keymap] Add peott-fr H87 keymap (#14232)peott-fr
2021-09-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-01[Keymap] Jonavin keymap gmmk pro (#14220)jonavin
add rgb nightmode and optional colemak layer Co-authored-by: Jonavin <=>
2021-09-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-01[Keymap] own scylla keymap (#14224)Christian Eiden
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-01[Docs] Update path to keycode.h (#14263)qieq
2021-09-01Merge remote-tracking branch 'origin/master' into developQMK Bot
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
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-18 18:03:54 +0000