QMK Bot
4b60090dc8
Merge remote-tracking branch 'origin/develop' into xap
2026-01-03 13:54:25 +00:00
QMK Bot
1051fae08d
Merge remote-tracking branch 'origin/master' into develop
2026-01-03 13:53:49 +00:00
Aymeric Wibo
f3a16ef21d
Fix typos in Aleblazer Zodiark readme ( #25925 )
2026-01-03 13:53:13 +00:00
QMK Bot
f105a37740
Merge remote-tracking branch 'origin/develop' into xap
2026-01-01 12:20:29 +00:00
QMK Bot
0d08ebb70a
Merge remote-tracking branch 'origin/master' into develop
2026-01-01 12:19:53 +00:00
QMK Bot
99b5b9ab7f
[CI] Regenerate Files ( #25920 )
...
Regenerate Files
0.31.5
2026-01-01 12:19:14 +00:00
QMK Bot
1e0ca1155d
Merge remote-tracking branch 'origin/develop' into xap
2026-01-01 08:38:39 +00:00
QMK Bot
389ec6df82
Merge remote-tracking branch 'origin/master' into develop
2026-01-01 08:38:02 +00:00
Piervit and Joel Challis
6a5610a8be
Fix functions layer_debug and default_layer_debug ( #25913 )
...
Co-authored-by: Joel Challis <git@zvecr.com >
0.31.4
2026-01-01 00:37:25 -08:00
QMK Bot
b014822a95
Merge remote-tracking branch 'origin/develop' into xap
2025-12-25 00:26:05 +00:00
QMK Bot
4f451a76f2
Merge remote-tracking branch 'origin/master' into develop
2025-12-25 00:25:27 +00:00
Joel Challis
acbeec29da
Reduce frequency of automatic workflow run approval ( #25896 )
2025-12-25 00:24:50 +00:00
QMK Bot
8566c74e27
Merge remote-tracking branch 'origin/develop' into xap
2025-12-23 00:02:17 +00:00
QMK Bot
e05516d817
Merge remote-tracking branch 'origin/master' into develop
2025-12-23 00:01:39 +00:00
Danny
7e35cdda8a
Add FoldKB Rev. 2.1 with added underglow RGB LEDs ( #25885 )
2025-12-23 00:00:57 +00:00
QMK Bot
518a7d3d27
Merge remote-tracking branch 'origin/develop' into xap
2025-12-22 16:10:28 +00:00
Joel Challis
ae05baf08b
Fix out-of-bounds bootmagic config ( #25898 )
2025-12-22 16:09:49 +00:00
QMK Bot
3d1afd6139
Merge remote-tracking branch 'origin/develop' into xap
2025-12-21 20:53:25 +00:00
Joel Challis
c1161a7a32
Refactor core use of deprecated isLeftHand ( #25888 )
2025-12-21 20:52:55 +00:00
Joel Challis
f82d4d8680
Refactor keyboard/keymap use of deprecated isLeftHand ( #25891 )
2025-12-21 20:52:48 +00:00
QMK Bot
60d5be82d8
Merge remote-tracking branch 'origin/develop' into xap
2025-12-21 04:08:58 +00:00
QMK Bot
d420bcad33
Merge remote-tracking branch 'origin/master' into develop
2025-12-21 04:08:20 +00:00
Joel Challis
dba60e2e65
Re-fix building of XAP keymaps on master/develop ( #25892 )
2025-12-21 15:07:40 +11:00
QMK Bot
5a72eed058
Merge remote-tracking branch 'origin/develop' into xap
2025-12-20 20:35:13 +00:00
QMK Bot
7f9c8429e4
Merge remote-tracking branch 'origin/master' into develop
2025-12-20 20:34:36 +00:00
Joel Challis
c68281b353
Handle building of XAP keymaps on master/develop ( #25848 )
2025-12-21 07:33:58 +11:00
zvecr
9c33bbf596
Fix zvecr/zv48:xap keymap
2025-12-19 04:19:28 +00:00
QMK Bot
49a73d8f57
Merge remote-tracking branch 'origin/develop' into xap
2025-12-19 03:29:28 +00:00
Joshua Diamond and Joel Challis
41c2a7b070
Include userspace version (QMK_USERSPACE_VERSION) in version.h ( #25882 )
...
* Include userspace version in version.h
* Update lib/python/qmk/cli/generate/version_h.py
Co-authored-by: Joel Challis <git@zvecr.com >
* Update lib/python/qmk/cli/generate/version_h.py
Co-authored-by: Joel Challis <git@zvecr.com >
* Update lib/python/qmk/cli/generate/version_h.py
Co-authored-by: Joel Challis <git@zvecr.com >
---------
Co-authored-by: Joel Challis <git@zvecr.com >
2025-12-18 22:23:51 -05:00
QMK Bot
078aff5a5d
Merge remote-tracking branch 'origin/develop' into xap
2025-12-19 02:29:18 +00:00
QMK Bot
bc8218371e
Merge remote-tracking branch 'origin/master' into develop
2025-12-19 02:27:38 +00:00
Joel Challis
84d44e6188
Update bootstrap_testing.yml
2025-12-19 02:26:58 +00:00
QMK Bot
2d0ab8abc2
Merge remote-tracking branch 'origin/develop' into xap
2025-12-19 02:24:47 +00:00
QMK Bot
27c2960320
Merge remote-tracking branch 'origin/master' into develop
2025-12-19 02:24:07 +00:00
Joel Challis
54e8fad959
Ignore merge commits on bootstrap testing PRs ( #25884 )
0.31.3
2025-12-19 02:23:29 +00:00
zvecr
81a855d9ec
Merge remote-tracking branch 'origin/develop' into xap
2025-12-15 00:27:35 +00:00
QMK Bot
42a7969d4a
Merge remote-tracking branch 'origin/master' into develop
2025-12-15 00:21:42 +00:00
Joel Challis
2c847b0350
Consistently install branch specific dependencies in CI ( #25874 )
2025-12-15 00:21:06 +00:00
QMK Bot
22c3e4266f
Merge remote-tracking branch 'origin/develop' into xap
2025-12-12 21:18:11 +00:00
QMK Bot
13f3f189b4
Merge remote-tracking branch 'origin/master' into develop
2025-12-12 21:17:32 +00:00
dependabot[bot] and dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
e1c869b8da
Bump actions/download-artifact from 6 to 7 ( #25873 )
...
Bumps [actions/download-artifact](https://github.com/actions/download-artifact ) from 6 to 7.
- [Release notes](https://github.com/actions/download-artifact/releases )
- [Commits](https://github.com/actions/download-artifact/compare/v6...v7 )
---
updated-dependencies:
- dependency-name: actions/download-artifact
dependency-version: '7'
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-12-12 21:16:52 +00:00
zvecr
5d3512582d
Merge remote-tracking branch 'upstream/develop' into xap
2025-12-12 21:01:02 +00:00
zvecr
0150b7b71f
clang-format-19 formatting fixes
2025-12-12 21:00:35 +00:00
QMK Bot
63a1d506a0
Merge remote-tracking branch 'origin/master' into develop
2025-12-12 20:11:55 +00:00
dependabot[bot] and dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
9e0118172f
Bump actions/upload-artifact from 5 to 6 ( #25872 )
...
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact ) from 5 to 6.
- [Release notes](https://github.com/actions/upload-artifact/releases )
- [Commits](https://github.com/actions/upload-artifact/compare/v5...v6 )
---
updated-dependencies:
- dependency-name: actions/upload-artifact
dependency-version: '6'
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-12-12 20:11:19 +00:00
QMK Bot
ca8105eac0
Merge remote-tracking branch 'origin/master' into develop
2025-12-12 18:31:29 +00:00
Joel Challis
4f9582da26
Install branch specific dependencies as part of bootstrap testing ( #25871 )
2025-12-12 18:30:46 +00:00
QMK Bot
f39fc08338
Merge remote-tracking branch 'origin/master' into develop
2025-12-12 18:19:07 +00:00
Joshua Diamond
2e68ddc826
Fix broken compilation when OS_DETECTION_DEBUG_ENABLE is defined ( #25869 )
...
Fix include in os_detection (broken in https://github.com/qmk/qmk_firmware/pull/24356 )
0.31.2
2025-12-12 18:17:42 +00:00
QMK Bot
1be7cde61f
Merge remote-tracking branch 'origin/master' into develop
2025-12-10 19:12:54 +00:00