summaryrefslogtreecommitdiffstats
path: root/users
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-313-2/+10
|\
| * [Keymap] Disable in-switch RGB when computer goes to bed (#14993)MechMerlin2021-10-303-2/+10
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-305-163/+263
|\|
| * [Keymap] Jonavin userspace encoder alt tab scrolling (#14979)jonavin2021-10-305-163/+263
| | | | | | Co-authored-by: Jonavin <=>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-291-2/+2
|\|
| * [Keymap] ajp10304: add mouse scroll keys (#14953)Alan Pocklington2021-10-291-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-261-1/+0
|\|
| * Remove unused KEYBOARD_LOCK_ENABLE from rules (#14920)Drashna Jaelre2021-10-251-1/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-231-1/+35
|\|
| * [Keymap] Add logo to riblee userspace (#14875)Reibl János Dániel2021-10-231-1/+35
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-231-0/+6
|\|
| * [Keymap] Simplify unicode input mode change and CTRL and GUI swapping (#14874)Reibl János Dániel2021-10-221-0/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-235-1/+33
|\|
| * [Keymap] Jonavin userspace keymap updates INVERT_NUMLOCK_INDICATOR (#14880)jonavin2021-10-225-1/+33
| | | | | | Co-authored-by: Jonavin <=>
* | Tidy up LCD_ENABLE/visualizer references (#14855)Joel Challis2021-10-201-21/+0
| | | | | | | | | | | | | | * Tidy up LCD_ENABLE/visualizer references * Fix up my (333fred) ergodox keymap with new LCD driver Co-authored-by: Fredric Silberberg <fred@silberberg.xyz>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-166-405/+483
|\|
| * [Keymap] Update Miryoku (#14827)Manna Harbour2021-10-156-405/+483
| |
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-10-157-1019/+762
|\|
| * [Keymap] Drashna Keymap Updates (#14842)Drashna Jaelre2021-10-157-1019/+762
| | | | | | | | | | | | | | * Fix issues with user split transport code * Improve OLED (More font stuff, improved keylogger, etc) * Add `KEYLOCK` macro to disable USB, borrowed from command feature. * Convert Kyria fully to proton C (no more AVR kyria) * Add Work Louder Work Board keymap
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-168-0/+392
|\|
| * [Keymap] zigotica userspace (#14670)Sergi Meseguer2021-10-158-0/+392
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-162-2/+3
|\|
| * [Keymap] Userspace updates (#14832)stanrc852021-10-152-2/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-141-1/+13
|\|
| * [Keymap] Display default layer name (#14819)Reibl János Dániel2021-10-141-1/+13
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-122-0/+8
|\|
| * [Keymap] Add workman layout (#14792)Reibl János Dániel2021-10-112-0/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-124-43/+112
|\|
| * [Keymap] Jonavin new obe keymap (#14657)jonavin2021-10-114-43/+112
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Jonavin <=>
* | Remove sysex API (#14723)Ryan2021-10-061-1/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-054-4/+20
|\|
| * [Keymap] Some updates to mechmerlin userspace and keymaps (#14711)MechMerlin2021-10-054-4/+20
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-295-47/+43
|\|
| * [Keymap] Update to Drashna Code (#14644)Drashna Jaelre2021-09-295-47/+43
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-292-1/+75
|\|
| * [Keymap] Jonavin murphpad keymap update (#14637)jonavin2021-09-292-1/+75
| | | | | | Co-authored-by: Jonavin <=>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-283-57/+87
|\|
| * [Keymap] fix NKRO - switch to get_mods() and refactor encoder action code ↵jonavin2021-09-283-57/+87
| | | | | | | | | | (#14278) Co-authored-by: Jonavin <=>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-281-0/+4
|\|
| * [Keymap] arkag userspace/keymap -- new macro and minor preonic keymap change ↵Alexander Kagno2021-09-281-0/+4
| | | | | | | | | | (#14623) Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-271-2/+1
|\|
| * Cleanup issues identified by lgtm (#14459)Zach White2021-09-271-2/+1
| | | | | | | | | | * cleanup issues identified by lgtm * fix the git_status check
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-09-2010-48/+216
|\|
| * [Keymap] Updates to existing keymaps and userspace (#14503)Konstantin Đorđević2021-09-1910-48/+216
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-132-0/+40
|\|
| * [Keymap] Userspace updates (#14418)stanrc852021-09-132-0/+40
| |
* | Move Bluetooth config to common_features.mk (#14404)Ryan2021-09-121-2/+2
|/ | | | | | | | | * Move Bluetooth config to common_features.mk * Update common_features.mk Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* [Keymap] moults31 userspace and keymaps (#12025)Zac Moulton2021-09-1010-0/+482
|
* [Keymap] Fix Drashna Keymap issues missed before Develop merge (#14271)Drashna Jaelre2021-09-013-105/+113
|
* [Keymap] hvp keymap for Cornelius, updated ut47.2 and userspace (#14187)hvp2021-09-015-7/+120
|