Commit Graph

25176 Commits

Author SHA1 Message Date
QMK Bot
d4ead8783c Merge remote-tracking branch 'origin/master' into develop 2022-12-07 21:02:49 +00:00
Jordan Duabe
bb3d694875
[Keyboard] Add NCR-80 (#19130) 2022-12-07 13:02:05 -08:00
QMK Bot
4ab83bd473 Merge remote-tracking branch 'origin/develop' into xap 2022-12-07 18:00:46 +00:00
QMK Bot
2183eda7ac Merge remote-tracking branch 'origin/master' into develop 2022-12-07 18:00:05 +00:00
Ryan
405aa7b2ed
Fix keyboard for some JSON keymaps (#19251) 2022-12-07 17:59:23 +00:00
QMK Bot
580ec0593c Merge remote-tracking branch 'origin/develop' into xap 2022-12-07 15:57:59 +00:00
QMK Bot
25b9e34fbe Merge remote-tracking branch 'origin/master' into develop 2022-12-07 15:57:26 +00:00
James Young
760e5c2ee1
ASK55: correct layout data (#19252) 2022-12-07 15:56:21 +00:00
QMK Bot
d7ccc8e642 Merge remote-tracking branch 'origin/develop' into xap 2022-12-06 21:45:25 +00:00
QMK Bot
8cba1d3297 Merge remote-tracking branch 'origin/master' into develop 2022-12-06 21:44:52 +00:00
dependabot[bot]
3fa1e8e273
Bump anothrNick/github-tag-action from 1.53.0 to 1.54.0 (#19246)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-07 08:44:19 +11:00
QMK Bot
c69a9afbc4 Merge remote-tracking branch 'origin/develop' into xap 2022-12-06 15:59:05 +00:00
QMK Bot
71c1ca47db Merge remote-tracking branch 'origin/master' into develop 2022-12-06 15:58:25 +00:00
leah-splitkb
0e93b0d59b
[Keyboard] Add splitkb.com's Aurora Lily58 (#19183) 2022-12-06 15:57:50 +00:00
QMK Bot
667af88efe Merge remote-tracking branch 'origin/develop' into xap 2022-12-06 08:33:08 +00:00
Xelus22
0b1d5497fc
[Keyboard] Refactor xs60 with soldered and hotswap version (#19049)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-12-06 00:32:25 -08:00
QMK Bot
a9b95a105b Merge remote-tracking branch 'origin/develop' into xap 2022-12-05 19:33:03 +00:00
QMK Bot
76c69f35c5 Merge remote-tracking branch 'origin/master' into develop 2022-12-05 19:32:26 +00:00
dependabot[bot]
2709b6ed61
Bump anothrNick/github-tag-action from 1.52.0 to 1.53.0 (#19242)
Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.52.0 to 1.53.0.
- [Release notes](https://github.com/anothrNick/github-tag-action/releases)
- [Commits](https://github.com/anothrNick/github-tag-action/compare/1.52.0...1.53.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>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-05 19:31:20 +00:00
QMK Bot
c1cd2ffd93 Merge remote-tracking branch 'origin/develop' into xap 2022-12-05 02:33:50 +00:00
QMK Bot
1fd2ef2bcb Merge remote-tracking branch 'origin/master' into develop 2022-12-05 02:33:15 +00:00
Joel Challis
92fadf0110
Ensure info.json layout macros are somewhat valid (#19236) 2022-12-05 02:32:40 +00:00
QMK Bot
8865a2e616 Merge remote-tracking branch 'origin/develop' into xap 2022-12-04 21:04:53 +00:00
QMK Bot
3bf0a10990 Merge remote-tracking branch 'origin/master' into develop 2022-12-04 21:04:18 +00:00
mechlovin
92354b2ca8
[Keyboard] Add Olly_Octagon PCB to QMK (#19128)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-12-04 21:03:41 +00:00
QMK Bot
4bd22c1f29 Merge remote-tracking branch 'origin/develop' into xap 2022-12-04 20:59:23 +00:00
QMK Bot
db4934f922 Merge remote-tracking branch 'origin/master' into develop 2022-12-04 20:58:50 +00:00
Charly Delay
af14b212b9
Re-structure splinky support to handle versioning in the same fashion as for the teensy (#19123) 2022-12-04 20:58:12 +00:00
QMK Bot
2e6e1bc0c0 Merge remote-tracking branch 'origin/develop' into xap 2022-12-04 20:49:10 +00:00
QMK Bot
41b1f7283b Merge remote-tracking branch 'origin/master' into develop 2022-12-04 20:48:35 +00:00
mechlovin
ea1a6975a8
[Keyboard] Add ISO layout support for Zed60 PCB (#19204)
* add iso layout

* Update zed60.h
2022-12-04 20:47:56 +00:00
QMK Bot
1c3921b696 Merge remote-tracking branch 'origin/develop' into xap 2022-12-04 20:44:35 +00:00
QMK Bot
b4073e11e1 Merge remote-tracking branch 'origin/master' into develop 2022-12-04 20:44:02 +00:00
David Kühling
2f92880578
dqz11n1g: Documentation improvement. (#19230)
Co-authored-by: David <dvdkhlng@posteo.de>
2022-12-04 20:43:28 +00:00
QMK Bot
4cbaf2c0fe Merge remote-tracking branch 'origin/develop' into xap 2022-12-04 18:54:17 +00:00
QMK Bot
9e757ea5d0 Merge remote-tracking branch 'origin/master' into develop 2022-12-04 18:53:44 +00:00
dztech
4d1b1bc534
[Keyboard] add kbdpadmk3 (#18795)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-12-04 10:53:08 -08:00
QMK Bot
ceba66e1cf Merge remote-tracking branch 'origin/develop' into xap 2022-12-04 09:36:31 +00:00
QMK Bot
dd252ebb55 Merge remote-tracking branch 'origin/master' into develop 2022-12-04 09:35:58 +00:00
gshmu
1dd77d9944
[Keymap] gshmu keymap for lily58 (#19040) 2022-12-04 01:35:23 -08:00
QMK Bot
913d1fb4a2 Merge remote-tracking branch 'origin/develop' into xap 2022-12-04 09:27:39 +00:00
QMK Bot
3af6fb5d0f Merge remote-tracking branch 'origin/master' into develop 2022-12-04 09:26:59 +00:00
lalalademaxiya1
d878edfaad
[Keyboard] Add Keychron Q8 (#19126) 2022-12-04 01:26:27 -08:00
QMK Bot
19a11e05f3 Merge remote-tracking branch 'origin/develop' into xap 2022-12-04 09:23:27 +00:00
QMK Bot
76a8778672 Merge remote-tracking branch 'origin/master' into develop 2022-12-04 09:22:54 +00:00
dztech
ee772ad165
[Keyboard] add odinmini keyboard (#19111)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-12-04 01:22:21 -08:00
QMK Bot
9e748cb583 Merge remote-tracking branch 'origin/develop' into xap 2022-12-04 07:17:45 +00:00
QMK Bot
45c288d5b1 Merge remote-tracking branch 'origin/master' into develop 2022-12-04 07:17:06 +00:00
micros24
6af12001eb
[Keymap] KBDFans Tiger80 Keymap (#19148)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Jasper Jan O. Solee <jjosolee@mymail.mapua.edu.ph>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-12-03 23:16:34 -08:00
QMK Bot
34cd90b4b2 Merge remote-tracking branch 'origin/develop' into xap 2022-12-04 07:16:16 +00:00