summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-041-1/+1
|\
| * Fix Space Cadet md link (#14300)JayceFayne2021-09-041-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-042-4/+4
|\|
| * Enable extra keys for Technik ortho and stagger (#14282)Albert Y2021-09-042-4/+4
| | | | | | | | | | | | | | * Extra keys for technik ortho * Extra keys for technik staggered Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-035-42/+44
|\|
| * FJLabs Ready100 Configurator Fixes (#14291)James Young2021-09-035-42/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * grid-align keycodes; use short-form keycodes No logic change. * info.json: correct layout macro reference * info.json: correct LAYOUT_64key data Removes an extra key from the layout data. * 64_ansi Community Layout support * rename LAYOUT_64key to LAYOUT_64_ansi (with alias for backwards compatibility) * add LAYOUTS = 64_ansi to rules.mk * remove width and height keys from info.json
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-036-12/+15
|\|
| * Naiping NPhhkb: 60_tsangan_hhkb Community Layout support (#14292)James Young2021-09-036-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | * 60_tsangan_hhkb Community Layout support * rename LAYOUT to LAYOUT_60_tsangan_hhkb * add LAYOUTS = 60_tsangan_hhkb to rules.mk * correct maintainer field in info.json * remove width and height keys from info.json * fix GitHub account link on readme
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-031-182/+47
|\|
| * takashicompany/endzone34: correct QMK Configurator key sequence (#14290)James Young2021-09-031-182/+47
| | | | | | | | | | | | | | | | | | | | * update info.json formatting * convert tabs to spaces * apply human-friendly formatting * correct Configurator key sequence * remove width and height keys from info.json
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-035-10/+13
|\|
| * OwLab Voice65 Hotswap: 65_ansi_blocker Community Layout support (#14293)James Young2021-09-035-10/+13
| | | | | | | | | | | | | | | | * 65_ansi_blocker Community Layout support * rename LAYOUT to LAYOUT_65_ansi_blocker (with alias for backwards compatibility) * add LAYOUTS = 65_ansi_blocker to rules.mk * remove width and height keys from info.json
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-0317-108/+12
|\|
| * Remove more cruft in keyboard files (#14288)Ryan2021-09-0317-108/+12
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-023-26/+51
|\|
| * [Keymap] Update iris fluffactually keymap (#14265)jhauh2021-09-023-26/+51
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-028-112/+331
|\|
| * [Keyboard] Work Louder board fixup (#14247)Drashna Jaelre2021-09-028-112/+331
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] Add some last minute tweaks to Work board * Additional fixes * Fix rgb pin * Fix ws2812 hackery * additional led tweaks * Add indicator LEDs * fix bootmagic settings * Fix up RGB stuff * Limit power draw for entire board * fixup lights and such * change LED order on loop * Fix indicators if via is not enabled * Enable Sleep for rgb matrix * Even more LED tweaks * Final tweaks? * Tweak keycodes
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 08:35:46 +0000