QMK Bot
48211918d1
Merge remote-tracking branch 'origin/develop' into xap
2023-04-12 17:33:13 +00:00
QMK Bot
614a682d3f
Merge remote-tracking branch 'origin/master' into develop
2023-04-12 17:32:34 +00:00
Tommy Oldfield
83dcbefeed
[Keymap] Add personal keymap for Lily58 ( #18735 )
2023-04-12 10:31:47 -07:00
QMK Bot
a82915293f
Merge remote-tracking branch 'origin/develop' into xap
2023-04-12 17:29:30 +00:00
QMK Bot
134586d834
Merge remote-tracking branch 'origin/master' into develop
2023-04-12 17:28:51 +00:00
Josh Hinnebusch
18335ddda5
[Keyboard] Fix h87 g2 VID conflict ( #20388 )
2023-04-12 10:27:37 -07:00
QMK Bot
f8e36408da
Merge remote-tracking branch 'origin/develop' into xap
2023-04-12 15:36:35 +00:00
Moritz Plattner
c57902d443
[Keyboard] Add support for ISO version of Durgod Hades ( #20110 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-04-12 08:36:28 -07:00
QMK Bot
41add95eb6
Merge remote-tracking branch 'origin/master' into develop
2023-04-12 15:35:55 +00:00
Ryan
051485c579
[Keymap] PHSC138 Keymap for Atom47 ( #18768 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-04-12 08:35:12 -07:00
QMK Bot
0326172b6f
Merge remote-tracking branch 'origin/develop' into xap
2023-04-12 15:35:12 +00:00
QMK Bot
a9ec2b3ada
Merge remote-tracking branch 'origin/master' into develop
2023-04-12 15:34:30 +00:00
Jeff Epler
5012dfd719
[Keyboard] add kb2040 flavor of gherkin ( #18360 )
2023-04-12 08:33:42 -07:00
QMK Bot
2d78426c05
Merge remote-tracking branch 'origin/develop' into xap
2023-04-12 15:09:26 +00:00
QMK Bot
9994e8c57f
Merge remote-tracking branch 'origin/master' into develop
2023-04-12 15:08:47 +00:00
Less/Rikki
641698d356
[Keyboard] ymdk/id75 ( #19967 )
...
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-04-12 08:07:47 -07:00
QMK Bot
668980b670
Merge remote-tracking branch 'origin/develop' into xap
2023-04-12 14:24:49 +00:00
Manuel Ullmann
1502193181
quantum/action_util.c: Use uint8_t for oneshot_layer_data ( #20423 )
2023-04-12 07:24:07 -07:00
QMK Bot
1653df76d9
Merge remote-tracking branch 'origin/develop' into xap
2023-04-12 14:23:08 +00:00
Giuseppe Rota
e77699a58a
Fix preprocessor condition for SPLIT_HAPTIC_ENABLE ( #20411 )
2023-04-12 07:22:07 -07:00
QMK Bot
d28a0e019b
Merge remote-tracking branch 'origin/develop' into xap
2023-04-12 10:12:23 +00:00
QMK Bot
e699724645
Merge remote-tracking branch 'origin/master' into develop
2023-04-12 10:11:37 +00:00
Mike Killewald
75edefe541
fixing bug that caused KC_DEL and KC_MUTE (encoder press) to be swapped ( #20420 )
2023-04-12 11:10:50 +01:00
QMK Bot
3b83058b53
Merge remote-tracking branch 'origin/develop' into xap
2023-04-12 03:43:29 +00:00
Ryan
5bd68e3695
Move single LAYOUT
s to data driven ( #20365 )
2023-04-12 13:42:51 +10:00
QMK Bot
0bafb6f1e4
Merge remote-tracking branch 'origin/develop' into xap
2023-04-11 20:45:58 +00:00
James Young
941e159a28
Merge remote-tracking branch 'origin/master' into develop
2023-04-11 13:42:35 -07:00
James Young
7e6eba674a
4pplet/bootleg/rev_a Layout Macro Conversion and Addition ( #20400 )
...
* info.json: apply friendly formatting
* move matrix data to info.json
* add LAYOUT_60_ansi_split_bs_rshift
2023-04-11 13:26:41 -07:00
QMK Bot
99a737dfb2
Merge remote-tracking branch 'origin/develop' into xap
2023-04-11 18:34:03 +00:00
QMK Bot
fbf6727eb8
Merge remote-tracking branch 'origin/master' into develop
2023-04-11 18:33:13 +00:00
James Young
26b35a54cf
4pplet/aekiso60 Layout Macro Conversion and Additions ( #20399 )
...
* add matrix_diagram.md
Adds `matrix_diagram.md` to the `4pplet/aekiso60` directory, and removes the diagrams from the keyboard revision header files.
* info.json: apply friendly formatting
* move matrix data to info.json
* create keyboard-level info.json
* add LAYOUT_60_iso_tsangan
* enable Community Layout support
2023-04-11 11:31:56 -07:00
QMK Bot
7a43bc07c5
Merge remote-tracking branch 'origin/develop' into xap
2023-04-11 01:45:02 +00:00
QMK Bot
b8d7f28af1
Merge remote-tracking branch 'origin/master' into develop
2023-04-11 01:44:24 +00:00
Joel Challis
38700f7e3f
Reject info.json at keymap level ( #20408 )
2023-04-11 02:43:45 +01:00
QMK Bot
500f8a0360
Merge remote-tracking branch 'origin/develop' into xap
2023-04-10 22:51:08 +00:00
QMK Bot
ae1e6b7a14
Merge remote-tracking branch 'origin/master' into develop
2023-04-10 22:50:31 +00:00
dependabot[bot]
ed72c423be
Bump anothrNick/github-tag-action from 1.61.0 to 1.62.0 ( #20407 )
...
Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action ) from 1.61.0 to 1.62.0.
- [Release notes](https://github.com/anothrNick/github-tag-action/releases )
- [Commits](https://github.com/anothrNick/github-tag-action/compare/1.61.0...1.62.0 )
---
updated-dependencies:
- dependency-name: anothrNick/github-tag-action
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-10 23:49:53 +01:00
QMK Bot
ef07fe6c44
Merge remote-tracking branch 'origin/develop' into xap
2023-04-10 19:33:47 +00:00
QMK Bot
6f77559061
Merge remote-tracking branch 'origin/master' into develop
2023-04-10 19:33:02 +00:00
Vertex-kb
bc6db2823c
[Keyboard] Update angle65 VID/PID ( #20401 )
2023-04-10 13:32:16 -06:00
QMK Bot
d7a7c1c301
Merge remote-tracking branch 'origin/develop' into xap
2023-04-10 12:46:00 +00:00
Ricardo Hermida Ruiz
d3b8179f46
Prevent Tri-Layer keys from stopping caps words ( #20398 )
2023-04-10 13:45:25 +01:00
QMK Bot
6ecc5d5b84
Merge remote-tracking branch 'origin/develop' into xap
2023-04-10 01:33:35 +00:00
Nick Brassel
f8d70116cc
Fix up via keymap builds. ( #20397 )
2023-04-10 02:32:56 +01:00
QMK Bot
41360858ab
Merge remote-tracking branch 'origin/develop' into xap
2023-04-09 21:39:21 +00:00
QMK Bot
15e5a586c1
Merge remote-tracking branch 'origin/master' into develop
2023-04-09 21:38:46 +00:00
Nick Brassel
fb706f42a2
Run CI builds for each push, limit queued workflow depth to 1. ( #20362 )
2023-04-09 22:38:09 +01:00
QMK Bot
fa4c08f385
Merge remote-tracking branch 'origin/develop' into xap
2023-04-09 21:34:01 +00:00
QMK Bot
da1a52ac65
Merge remote-tracking branch 'origin/master' into develop
2023-04-09 21:33:24 +00:00
Ryan
9132c64389
Add numpad 0-9 to second layer, update keycodes for QMK 0.17.5, fix layout ( #20375 )
2023-04-09 22:32:40 +01:00