Henry-Hiles/qmk_userspace
1
0
Fork 0
forked from mirrors/qmk_userspace
Code Pull requests Activity
23,211 commits 2 branches 1 tag 294 MiB
Commit graph

23,211 commits

This branch
This branch
All branches
Author SHA1 Message Date
James Young
47f978e9cc
 		Remove keyboard_folder instances from info.json files (#15932) 
* remove `keyboard_folder` instance from caffeinated/serpent65

* remove `keyboard_folder` instances from dumbpad

* remove `keyboard_folder` instances from mlego directory

* remove `keyboard_folder` instance from neopad/rev1

* remove `keyboard_folder` instance from spaceman/pancake/rev2
 2022-01-19 00:18:45 +00:00
QMK Bot
b825af0728 Merge remote-tracking branch 'origin/master' into develop 2022-01-18 18:25:03 +00:00
IskandarMa
f6a7f4d4ac
 		update the Chinese translation based on the latest English version (#14924) 
Co-authored-by: peepeetee <43021794+peepeetee@users.noreply.github.com>
Co-authored-by: Joy Lee <chang.li@westberrytech.com>
Co-authored-by: LitoMore <LitoMore@users.noreply.github.com>
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
 2022-01-18 18:24:02 +00:00
QMK Bot
9a65cc39da Merge remote-tracking branch 'origin/master' into develop 2022-01-17 19:01:26 +00:00
moyi4681
8a3dfe2246
 		[Keyboard] fix odin rgb light error (#15914) 2022-01-17 11:00:48 -08:00
QMK Bot
fb65f07832 Merge remote-tracking branch 'origin/master' into develop 2022-01-17 14:12:32 +00:00
Albert Y
b8951a0458
 		Add LAYOUTS entry to rules.mk (#15900) 
* Add layouts to rules.mk

* Remove excess settings.

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
 2022-01-17 14:11:58 +00:00
Ryan
c72ed7c024
 		CLI: Parse USB device version BCD (#14580) 
* CLI: Parse USB device version BCD

* Apply suggestions
 2022-01-17 08:44:34 +11:00
Nick Brassel
557fbbd6af
 		Yet another bad DEFAULT_FOLDER fix. (#15904) 2022-01-16 20:12:58 +00:00
peepeetee
217ad5cfc0
 		move yd60mq to ymdk vendor folder (#15647) 2022-01-17 07:01:00 +11:00
QMK Bot
6a723c3571 Merge remote-tracking branch 'origin/master' into develop 2022-01-16 19:59:22 +00:00
Nick Brassel
d02be63000
 		Revert "update keyboard_aliases.json (#15649)" (#15903) 
This reverts commit b24603ab7d.
 2022-01-17 06:58:48 +11:00
QMK Bot
069e232bab Merge remote-tracking branch 'origin/master' into develop 2022-01-16 19:54:12 +00:00
peepeetee
b24603ab7d
 		update keyboard_aliases.json (#15649) 2022-01-17 06:53:43 +11:00
peepeetee
15290f4366
 		rename idobo to idobao/id75, move to vendor folder (#15661) 
* rename idobo to idobao/id75, move to vendor folder

* add image, amend readme to id75

* add buying link
 2022-01-17 06:53:11 +11:00
Albert Y
1d3c2ceded
 		Add init function to clear previous effect (#15815) 2022-01-17 06:48:09 +11:00
QMK Bot
33384a3663 Merge remote-tracking branch 'origin/master' into develop 2022-01-15 20:23:36 +00:00
Bartosz Nowak
5380e6758c
 		Fix dactyl manuform 6x6 LAYOUT_6x6_5_thumb rendering (#15891) 2022-01-15 20:23:09 +00:00
QMK Bot
02637ec350 Merge remote-tracking branch 'origin/master' into develop 2022-01-15 07:51:29 +00:00
Drashna Jaelre
7edfb4deff
 		[Keyboard] Fix compilation issues for mechlovin hex4b (#15885) 2022-01-14 23:51:02 -08:00
QMK Bot
9cd2024814 Merge remote-tracking branch 'origin/master' into develop 2022-01-15 07:28:32 +00:00
Drashna Jaelre
5bad37cb56
 		[Bug] Remove config.h include in dynamic_keymap.c (#15886) 2022-01-15 18:28:29 +11:00
Paul James
922e29f16c
 		[Keyboard] Add Rosaline (#15595) 2022-01-14 23:28:03 -08:00
QMK Bot
b8dbebec2d Merge remote-tracking branch 'origin/master' into develop 2022-01-15 07:27:06 +00:00
HorrorTroll
b2ea12aaa5
 		[Keyboard] Add Devil68 Pro (#15820) 2022-01-14 23:26:26 -08:00
QMK Bot
f07ea255a9 Merge remote-tracking branch 'origin/master' into develop 2022-01-15 05:49:44 +00:00
GG
2e266c7ec1
 		[Keyboard] Fix encoder bug zoom65 and zoom65_litte (#15876) 2022-01-14 21:49:11 -08:00
Dasky
08a42dc72c
 		Fix broken bootloader builds in develop. (#15880) 2022-01-15 01:04:58 +00:00
QMK Bot
77eae62d62 Merge remote-tracking branch 'origin/master' into develop 2022-01-14 19:06:58 +00:00
Conor Burns
f8870a4c8a
 		[Keymap] added keymap conor with rgb layers (#15234) 2022-01-14 11:06:24 -08:00
QMK Bot
90f2a03895 Merge remote-tracking branch 'origin/master' into develop 2022-01-14 18:58:43 +00:00
lalalademaxiya1
ca0f922e07
 		[Keyboard] Add Keychron_q1 rev_0101 and Keychron q2 series (#15025) 
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Cesar Rojas <cesar.fieoner@gmail.com>
Co-authored-by: lokher <lokher@gmail.com>
Co-authored-by: Adam Karim <adam@akarsoft.com>
 2022-01-14 10:58:09 -08:00
QMK Bot
71a9384f49 Merge remote-tracking branch 'origin/master' into develop 2022-01-14 14:48:10 +00:00
Ryan
9e92d8a905
 		Make note of upper limit for UC() (#15870) 2022-01-14 14:47:36 +00:00
QMK Bot
cfc136f198 Merge remote-tracking branch 'origin/master' into develop 2022-01-14 14:47:32 +00:00
Ryan
61f0292f11
 		Remove network drive mapping comment for WSL (#15871) 2022-01-14 14:46:47 +00:00
QMK Bot
b7fb5f9987 Merge remote-tracking branch 'origin/master' into develop 2022-01-14 04:42:48 +00:00
Ryan Smith
fd4adbc0cc
 		[keyboard] Adding Atlas_65 (#15839) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2022-01-13 20:42:11 -08:00
QMK Bot
fba519116d Merge remote-tracking branch 'origin/master' into develop 2022-01-14 04:41:11 +00:00
Eric Gebhart
e865cab48e
 		[Keymap] ericgebhart keymap and userspace updates (#15727) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Co-authored-by: Drashna Jael're <drashna@live.com>
 2022-01-13 20:40:41 -08:00
QMK Bot
a7e1de81ff Merge remote-tracking branch 'origin/master' into develop 2022-01-14 04:38:56 +00:00
asdfire1
0f110737db
 		[Keyboard] Add VIA support for the Drop Alt (#15857) 2022-01-13 20:38:25 -08:00
QMK Bot
85743b9f32 Merge remote-tracking branch 'origin/master' into develop 2022-01-14 04:38:08 +00:00
DA
851cb7e406
 		[Keyboard] and CB87v2 and CB87RGB and fixed CB1800 and CB87 (#15824) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-01-13 20:37:40 -08:00
QMK Bot
7b75aa1818 Merge remote-tracking branch 'origin/master' into develop 2022-01-14 04:34:21 +00:00
Bartosz Nowak
5d51fd4015
 		[Keyboard] Fixing dactyl manuform 6x6 warnings (#15868) 2022-01-13 20:33:39 -08:00
QMK Bot
15d385a862 Merge remote-tracking branch 'origin/master' into develop 2022-01-13 21:56:21 +00:00
Tuk Bredsdorff
8fe320baa6
 		Fix keymap.json macro example (#15567) 2022-01-13 21:55:48 +00:00
QMK Bot
c93dc153f1 Merge remote-tracking branch 'origin/master' into develop 2022-01-13 20:44:40 +00:00
peott-fr
ae9feed566
 		Adding Quefrency keymap (#15852) 2022-01-13 20:43:40 +00:00