summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-021-91/+98
|\
| * PistachioPro: correct Configurator key sequence (#14277)James Young2021-09-021-91/+98
| | | | | | | | | | | | | | * info.json: apply human-friendly formatting * correct LAYOUT key sequence Moves the Enter key object to the correct place in sequence.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-021-7/+140
|\|
| * Matrix Falcon info.json fixes (#14273)James Young2021-09-021-7/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | * apply human-friendly formatting to info.json * update key labels; correct maintainer field * add LAYOUT_all data to info.json * remove width and height keys from info.json (per fauxpark) Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-021-55/+13
|\|
| * Yoichiro Lunakey Macro: correct Configurator key sequence (#14276)James Young2021-09-021-55/+13
| | | | | | | | | | * apply human-friendly formatting to info.json * correct Configurator key sequence
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-026-7/+486
|\|
| * [Keymap] new murphpad landscape keymap with encoder enhanced functions (#14103)jonavin2021-09-015-0/+479
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Jonavin <=>
| * [Keymap] Fine-tuning Nyquist keymap. (#14269)peott-fr2021-09-011-7/+7
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-029-114/+132
|\|
| * [Keymap] Fix Drashna Keymap issues missed before Develop merge (#14271)Drashna Jaelre2021-09-019-114/+132
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-028-91/+110
|\|
| * naiping/np64: 64_ansi Community Layout support and codebase touch-up (#14264)James Young2021-09-018-91/+110
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-029-51/+151
|\|
| * neson design/n6: Extended Community Layout Support and Layout Macro Fix (#14266)James Young2021-09-015-34/+134
| |
| * wuque/serneity65: Layout Macro rework and Configurator fix (#14267)James Young2021-09-014-17/+17
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-0212-36/+272
|\|
| * [Keymap] hvp keymap for Cornelius, updated ut47.2 and userspace (#14187)hvp2021-09-0111-36/+245
| |
| * [Keymap] Add peott-fr H87 keymap (#14232)peott-fr2021-09-011-0/+27
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-027-6/+70
|\|
| * [Keymap] Jonavin keymap gmmk pro (#14220)jonavin2021-09-017-6/+70
| | | | | | | | | | add rgb nightmode and optional colemak layer Co-authored-by: Jonavin <=>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-023-0/+244
|\|
| * [Keymap] own scylla keymap (#14224)Christian Eiden2021-09-013-0/+244
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-021-1/+1
|\|
| * [Docs] Update path to keycode.h (#14263)qieq2021-09-011-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-013-28/+28
|\|
| * MatchstickWorks SouthPad: correct Configurator key sequence (#14255)James Young2021-09-013-28/+28
| | | | | | | | | | * matchstickworks/southpad: correct Configurator key sequence * replace tabs with spaces; apply four-space indent
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-011-0/+30
|\|
| * owl8: add info.json file (#14256)James Young2021-09-011-0/+30
| | | | | | | | | | | | | | | | | | * 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>
* | Fix typos from 14248 (#14261)Ryan2021-09-016-6/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-012-3/+3
|\|
| * Fix snailmap compilation error (#14250)Jay Greco2021-09-012-3/+3
| | | | | | | | | | * Fix snailmap compilation error * Update keymap.c with correct OLED_ENABLE defines
* | Change keyboard level include guards to `pragma once` (#14248)Ryan2021-09-01308-4532/+3484
| | | | | | | | | | | | | | | | | | * Change keyboard level include guards to `pragma once` And clean up a lot of layout macros * Oops * Remove dangling endif
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-012-1/+200
|\|
| * mnk50: Configurator Fix and Layout Macro Additions (#14257)James Young2021-09-012-1/+200
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-015-41/+51
|\|
| * [Keymap] cwebster2 Keymap and userspace updates (#14258)Casey Webster2021-08-315-41/+51
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-3117-1/+1
|\|
| * Move GMMK Pro layouts to the correct subdir (#14241)Andre Brait2021-09-0117-1/+1
| | | | | | Also fix a compilation issue in the mike1808 keymap
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-311-1/+1
|\|
| * [Keyboard] Disable console on Iris Rev5 (#14249)Drashna Jaelre2021-08-311-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-311-20/+24
|\|
| * emi20: remove dead space from Configurator layout (#14254)James Young2021-08-311-20/+24
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-319-0/+419
|\|
| * [Keyboard] Add FJLabs KF87 PCB (#14179)Felix Jen2021-08-319-0/+419
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-3110-265/+231
|\|
| * [Keymap] reflects current rick's keymap (#14169)Ibnu Daru Aji2021-08-3110-265/+231
| |
* | handwired/symmetric70_proto use post_rules.mk (#14235)Takeshi ISHII2021-08-315-12/+2
| |
* | [Keyboard] Helix use `post_rules.mk` (#14216)Takeshi ISHII2021-08-3114-49/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ```
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-3111-29/+170
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 14:50:43 +0000