umi
5347577346
[Docs] update Japanese translation of isp_flashing_guide.md ( #13700 )
...
* update isp_flashing_guide.md translation
* update isp_flashing_guide.md translation
* correct url
* trim remaining merge identifier
2021-09-23 12:58:56 +09:00
QMK Bot
787cce1415
Merge remote-tracking branch 'origin/master' into develop
2021-09-23 03:55:47 +00:00
umi
7bfc6083b7
[Docs] update Japanese translation of feature_leader_key.md ( #13669 )
...
* update feature_leader_key.md translation
* update file based on comments
* update text based on comments
2021-09-23 12:55:19 +09:00
QMK Bot
e41f1e9460
Merge remote-tracking branch 'origin/master' into develop
2021-09-23 03:53:29 +00:00
umi
618a28c6ae
[Docs] update Japanese translation of one_shot_keys.md ( #13656 )
...
* update one_shot_keys.md translation
* update one_shot_keys.md translation
* correct paramter for function
* add change of #13754
2021-09-23 12:52:53 +09:00
QMK Bot
d5df1b81a3
Merge remote-tracking branch 'origin/master' into develop
2021-09-23 01:03:23 +00:00
drhigsby
4062860c05
[Keyboard] Bkf ( #14534 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-22 18:02:49 -07:00
James Young
4093732581
Merge remote-tracking branch 'upstream/master' into develop
2021-09-22 13:55:48 -07:00
James Young
1aaef6c988
Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (2021-09-22) ( #14567 )
...
* Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (2021-09-22)
* update keyboards/handwired/slash/rules.mk per fauxpark
2021-09-22 12:33:41 -07:00
QMK Bot
45ec15d1c3
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 16:53:42 +00:00
Drashna Jaelre
ce5bb612a9
[Keyboard] Fix default keymap for Draytronics Elise V2 keyboard ( #14562 )
2021-09-23 02:53:03 +10:00
QMK Bot
46e1b0d81c
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 16:48:25 +00:00
Drashna Jaelre
57d4e80845
[Keyboard] Disable console on Smallkeyboard ( #14561 )
2021-09-23 02:47:56 +10:00
QMK Bot
cd7ebe2a4e
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 06:50:17 +00:00
Blake
01b0eeac1e
[Keyboard] Version 2 of Draytronics Elise Keyboard + ISO Keymap Change ( #14253 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-21 23:49:46 -07:00
QMK Bot
71f34274ab
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 06:38:36 +00:00
Sets3n
c78a057ec4
[Keyboard] add kk980 keyboard ( #14436 )
2021-09-21 23:38:07 -07:00
QMK Bot
cf0ebe2d10
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 05:52:23 +00:00
Drashna Jaelre
5ddbabfa2a
[Keyboard] Fix jkb65 compile issues ( #14554 )
2021-09-21 22:51:54 -07:00
QMK Bot
d315268355
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 05:39:49 +00:00
Drashna Jaelre
ea5735b074
[Keyboard] Fix font file for Ein 60 Keyboard ( #14553 )
2021-09-21 22:39:19 -07:00
QMK Bot
0a4fef4549
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 04:26:27 +00:00
Brandon Claveria
9c564b6a5f
[Keyboard] Add Dango40 ( #14437 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Swiftrax <swiftrax@gmail.com>
Co-authored-by: Swiftrax <swiftrax@github.com>
2021-09-21 21:25:59 -07:00
QMK Bot
6a26c5cb80
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 04:24:51 +00:00
Caleb Lightfoot
c8a3353003
[Keyboard] Add Free Willy Keyboard ( #14394 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-21 21:24:44 -07:00
QMK Bot
c0cf461874
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 04:24:24 +00:00
Vinam Arora
02556b3d8a
[Keyboard] 0-Sixty: Splits kb config into base and underglow ( #14384 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-21 21:24:14 -07:00
kopibeng
4e0125c22c
[Keyboard] Add support for XT8x ( #14440 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-21 21:23:51 -07:00
QMK Bot
e6126ef6a6
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 04:22:14 +00:00
milostatsea
f37af05f2a
[Keyboard] fixed one of the unicode drawings of the layout in dz60.h ( #14482 )
2021-09-21 21:22:04 -07:00
QMK Bot
77bf0a5fc4
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 04:21:55 +00:00
WiZ.GG
88f6776216
[Keyboard] Add JadooKB JKB65 RGB ( #14525 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-21 21:21:44 -07:00
Pylon
e0022daf11
Changed VENDOR_ID and PRODUCT_ID of Boston keyboard ( #14528 )
2021-09-21 21:21:23 -07:00
QMK Bot
02b7515c67
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 04:20:18 +00:00
precondition
88283cdab8
[Keyboard] Add commented out OLED/encoder code in default Kyria ( #14539 )
...
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-21 21:19:50 -07:00
QMK Bot
975792bf53
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 04:18:59 +00:00
James Smith
43e88f34aa
[Keyboard] add ein_60 ( #14398 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-21 21:18:25 -07:00
QMK Bot
aa797aaa99
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 04:16:53 +00:00
Drashna Jaelre
208ea0e18c
[Keyboard] smallkeyboard fix of rgb matrix config ( #14548 )
2021-09-21 21:16:19 -07:00
QMK Bot
2300f52ef5
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 00:13:53 +00:00
Salicylic-acid3
033a318bdf
[Keyboard] Addition of VIA keymap and a few fixes for naked48 ( #14177 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-21 17:12:57 -07:00
Michael Stapelberg
2e670644fd
[Keyboard] Set USB max power consumption of kint* controllers to 100mA ( #14546 )
2021-09-21 16:48:41 -07:00
QMK Bot
8670a3c86c
Merge remote-tracking branch 'origin/master' into develop
2021-09-21 23:40:56 +00:00
Dasky
45f88af4a1
[Docs] update suspend_*_user examples ( #14542 )
2021-09-21 16:40:19 -07:00
QMK Bot
dd115fd50e
Merge remote-tracking branch 'origin/master' into develop
2021-09-21 22:53:09 +00:00
zhouqiong19840119
bb754069e9
[Keyboard] smallkeyboard support ( #12817 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-21 15:52:39 -07:00
Marcus van Houdt
8b6c16ea1f
Add ability to use numpad digits for unicode mode UC_WIN ( #14496 )
...
Co-authored-by: Konstantin Đorđević <vomindoraan@gmail.com>
2021-09-21 15:23:49 -07:00
QMK Bot
3583943c69
Merge remote-tracking branch 'origin/master' into develop
2021-09-21 22:07:28 +00:00
Laneware
32a96be093
[Keyboard] Macro-1 keyboard by Laneware Peripherals ( #14472 )
2021-09-21 15:06:56 -07:00
QMK Bot
82cf582ef3
Merge remote-tracking branch 'origin/master' into develop
2021-09-21 21:46:05 +00:00