Nick Brassel
f3c48f100a
Fixup compilation failures.
2023-03-30 08:49:10 +11:00
QMK Bot
7182bc41ec
Merge remote-tracking branch 'origin/develop' into xap
2023-03-29 21:41:20 +00:00
Nick Brassel
c0a24671ee
Actually commit conflict resolution.
2023-03-30 08:40:35 +11:00
QMK Bot
71c1d76c6c
Merge remote-tracking branch 'origin/develop' into xap
2023-03-29 21:38:29 +00:00
Nick Brassel
836ffabc3d
Merge remote-tracking branch 'upstream/master' into develop
2023-03-30 08:37:24 +11:00
QMK Bot
a4837db456
Merge remote-tracking branch 'origin/develop' into xap
2023-03-29 20:17:05 +00:00
Less/Rikki
68a27b8e92
[jacky_studio/piggy60] move AVR PCB under rev1 ( #20253 )
2023-03-29 14:16:20 -06:00
Maverick0197
d0c36a7683
[Keyboard] Add KeyDeck8 ( #20107 )
...
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-03-29 13:13:05 -07:00
4pplet
c6cc638752
[Keyboard] Add Steezy60 Rev B ( #19688 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
Co-authored-by: yiancar <yiancar@gmail.com>
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>
Co-authored-by: Jue Liu <youturn@Jues-MacBook-Pro.local>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Shandon Anderson <shandon@shandon.codes>
Co-authored-by: jack <0x6A73@pm.me>
Co-authored-by: jason <jrucker2004@gmail.com>
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
2023-03-29 13:10:47 -07:00
QMK Bot
2e23510313
Merge remote-tracking branch 'origin/develop' into xap
2023-03-29 19:36:13 +00:00
QMK Bot
f5e36620b2
Merge remote-tracking branch 'origin/master' into develop
2023-03-29 19:35:25 +00:00
Sắn
621dbdf8ee
[Keyboard] Add Plaque80 ( #20240 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2023-03-29 13:34:42 -06:00
QMK Bot
3158dabb26
Merge remote-tracking branch 'origin/develop' into xap
2023-03-29 18:48:37 +00:00
QMK Bot
3042381679
Merge remote-tracking branch 'origin/master' into develop
2023-03-29 18:47:54 +00:00
Alejandro Chacón
896f38c52c
[Keyboard] Add alhenkb macropad ( #20123 )
2023-03-29 11:47:14 -07:00
QMK Bot
d3de673bbf
Merge remote-tracking branch 'origin/develop' into xap
2023-03-29 12:02:34 +00:00
QMK Bot
66f19518b4
Merge remote-tracking branch 'origin/master' into develop
2023-03-29 12:01:55 +00:00
Joel Challis
f56580404d
Minify content published to API ( #20285 )
2023-03-29 13:01:16 +01:00
QMK Bot
9e9011b765
Merge remote-tracking branch 'origin/develop' into xap
2023-03-29 10:27:31 +00:00
QMK Bot
2026165d8c
Merge remote-tracking branch 'origin/master' into develop
2023-03-29 10:26:46 +00:00
Nick Brassel
5bb8f7ae84
Add ability for qmk mass-compile to build specified targets ( #20294 )
2023-03-29 21:26:05 +11:00
QMK Bot
5358ce1e96
Merge remote-tracking branch 'origin/develop' into xap
2023-03-29 07:16:47 +00:00
Nick Brassel
f18dd488da
Fixup CI build for nack. ( #20292 )
2023-03-29 18:15:55 +11:00
QMK Bot
91e22c0592
Merge remote-tracking branch 'origin/develop' into xap
2023-03-29 05:50:17 +00:00
QMK Bot
d95a8c7931
Merge remote-tracking branch 'origin/master' into develop
2023-03-29 05:49:39 +00:00
Nick Brassel
d31d1488e8
Fixup CI command failures. ( #20291 )
2023-03-29 16:48:57 +11:00
QMK Bot
ce3246a314
Merge remote-tracking branch 'origin/develop' into xap
2023-03-29 05:02:37 +00:00
fauxpark
9602938e9e
Merge remote-tracking branch 'upstream/master' into develop
2023-03-29 16:00:41 +11:00
Nick Brassel
6bdbf77238
Add step summary output to CI builds, with failure logs. ( #20288 )
2023-03-29 15:55:31 +11:00
QMK Bot
04e3e0a55f
Merge remote-tracking branch 'origin/develop' into xap
2023-03-29 04:55:13 +00:00
Ryan
4869b8061c
Move ortho & numpad layouts to data driven ( #20183 )
...
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-03-29 15:54:34 +11:00
Ryan
e2630f9b40
Fix some invalid layout macros ( #20256 )
2023-03-29 15:51:22 +11:00
QMK Bot
b36a8e97e2
Merge remote-tracking branch 'origin/develop' into xap
2023-03-29 04:48:41 +00:00
Ryan
06664e8a94
Fix layouts containing keys with multiple matrix positions ( #20191 )
2023-03-29 15:47:59 +11:00
QMK Bot
75798d9f5b
Merge remote-tracking branch 'origin/develop' into xap
2023-03-29 01:52:55 +00:00
QMK Bot
dc2a625a34
Merge remote-tracking branch 'origin/master' into develop
2023-03-29 01:52:18 +00:00
Nick Brassel
c94241d447
CI Builds: master/develop, default/via, twice daily. ( #20283 )
2023-03-29 12:51:39 +11:00
QMK Bot
922b153a53
Merge remote-tracking branch 'origin/develop' into xap
2023-03-29 01:10:46 +00:00
QMK Bot
6195b4fca2
Merge remote-tracking branch 'origin/master' into develop
2023-03-29 01:10:05 +00:00
Joel Challis
e0b1637e15
I have zero involvement with this keyboard... ( #20287 )
2023-03-29 02:09:26 +01:00
QMK Bot
c51fcb8057
Merge remote-tracking branch 'origin/develop' into xap
2023-03-28 16:29:41 +00:00
QMK Bot
26e60200ab
Merge remote-tracking branch 'origin/master' into develop
2023-03-28 16:27:18 +00:00
takashicompany
a6b2b1ca41
Add new keyboard Tightwriter ( #20136 )
...
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
2023-03-28 10:24:53 -06:00
QMK Bot
7cb5dce968
Merge remote-tracking branch 'origin/develop' into xap
2023-03-28 13:34:30 +00:00
QMK Bot
379bb62aac
Merge remote-tracking branch 'origin/master' into develop
2023-03-28 13:33:45 +00:00
Albert Y
02cb5db67b
Remove invalid characters ( #20277 )
2023-03-28 14:33:00 +01:00
QMK Bot
38c4a8e7d0
Merge remote-tracking branch 'origin/develop' into xap
2023-03-28 05:43:22 +00:00
QMK Bot
7eabf7efd1
Merge remote-tracking branch 'origin/master' into develop
2023-03-28 05:42:43 +00:00
blindassassin111
00c3946fbe
[keyboard] Correcting info.JSON for OSAv2 ( #20247 )
2023-03-27 23:42:04 -06:00
QMK Bot
ad33b072f5
Merge remote-tracking branch 'origin/develop' into xap
2023-03-28 01:54:05 +00:00
