Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-31 | 3 | -2/+10 |
|\ | |||||
| * | [Keymap] Disable in-switch RGB when computer goes to bed (#14993) | MechMerlin | 2021-10-30 | 3 | -2/+10 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-30 | 5 | -163/+263 |
|\| | |||||
| * | [Keymap] Jonavin userspace encoder alt tab scrolling (#14979) | jonavin | 2021-10-30 | 5 | -163/+263 |
| | | | | | | Co-authored-by: Jonavin <=> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-29 | 1 | -2/+2 |
|\| | |||||
| * | [Keymap] ajp10304: add mouse scroll keys (#14953) | Alan Pocklington | 2021-10-29 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-26 | 1 | -1/+0 |
|\| | |||||
| * | Remove unused KEYBOARD_LOCK_ENABLE from rules (#14920) | Drashna Jaelre | 2021-10-25 | 1 | -1/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-23 | 1 | -1/+35 |
|\| | |||||
| * | [Keymap] Add logo to riblee userspace (#14875) | Reibl János Dániel | 2021-10-23 | 1 | -1/+35 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-23 | 1 | -0/+6 |
|\| | |||||
| * | [Keymap] Simplify unicode input mode change and CTRL and GUI swapping (#14874) | Reibl János Dániel | 2021-10-22 | 1 | -0/+6 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-23 | 5 | -1/+33 |
|\| | |||||
| * | [Keymap] Jonavin userspace keymap updates INVERT_NUMLOCK_INDICATOR (#14880) | jonavin | 2021-10-22 | 5 | -1/+33 |
| | | | | | | Co-authored-by: Jonavin <=> | ||||
* | | Tidy up LCD_ENABLE/visualizer references (#14855) | Joel Challis | 2021-10-20 | 1 | -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 develop | QMK Bot | 2021-10-16 | 6 | -405/+483 |
|\| | |||||
| * | [Keymap] Update Miryoku (#14827) | Manna Harbour | 2021-10-15 | 6 | -405/+483 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | Drashna Jael're | 2021-10-15 | 7 | -1019/+762 |
|\| | |||||
| * | [Keymap] Drashna Keymap Updates (#14842) | Drashna Jaelre | 2021-10-15 | 7 | -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 develop | QMK Bot | 2021-10-16 | 8 | -0/+392 |
|\| | |||||
| * | [Keymap] zigotica userspace (#14670) | Sergi Meseguer | 2021-10-15 | 8 | -0/+392 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-16 | 2 | -2/+3 |
|\| | |||||
| * | [Keymap] Userspace updates (#14832) | stanrc85 | 2021-10-15 | 2 | -2/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-14 | 1 | -1/+13 |
|\| | |||||
| * | [Keymap] Display default layer name (#14819) | Reibl János Dániel | 2021-10-14 | 1 | -1/+13 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-12 | 2 | -0/+8 |
|\| | |||||
| * | [Keymap] Add workman layout (#14792) | Reibl János Dániel | 2021-10-11 | 2 | -0/+8 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-12 | 4 | -43/+112 |
|\| | |||||
| * | [Keymap] Jonavin new obe keymap (#14657) | jonavin | 2021-10-11 | 4 | -43/+112 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Jonavin <=> | ||||
* | | Remove sysex API (#14723) | Ryan | 2021-10-06 | 1 | -1/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-05 | 4 | -4/+20 |
|\| | |||||
| * | [Keymap] Some updates to mechmerlin userspace and keymaps (#14711) | MechMerlin | 2021-10-05 | 4 | -4/+20 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-29 | 5 | -47/+43 |
|\| | |||||
| * | [Keymap] Update to Drashna Code (#14644) | Drashna Jaelre | 2021-09-29 | 5 | -47/+43 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-29 | 2 | -1/+75 |
|\| | |||||
| * | [Keymap] Jonavin murphpad keymap update (#14637) | jonavin | 2021-09-29 | 2 | -1/+75 |
| | | | | | | Co-authored-by: Jonavin <=> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-28 | 3 | -57/+87 |
|\| | |||||
| * | [Keymap] fix NKRO - switch to get_mods() and refactor encoder action code ↵ | jonavin | 2021-09-28 | 3 | -57/+87 |
| | | | | | | | | | | (#14278) Co-authored-by: Jonavin <=> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-28 | 1 | -0/+4 |
|\| | |||||
| * | [Keymap] arkag userspace/keymap -- new macro and minor preonic keymap change ↵ | Alexander Kagno | 2021-09-28 | 1 | -0/+4 |
| | | | | | | | | | | (#14623) Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-27 | 1 | -2/+1 |
|\| | |||||
| * | Cleanup issues identified by lgtm (#14459) | Zach White | 2021-09-27 | 1 | -2/+1 |
| | | | | | | | | | | * cleanup issues identified by lgtm * fix the git_status check | ||||
* | | Merge remote-tracking branch 'upstream/master' into develop | fauxpark | 2021-09-20 | 10 | -48/+216 |
|\| | |||||
| * | [Keymap] Updates to existing keymaps and userspace (#14503) | Konstantin Đorđević | 2021-09-19 | 10 | -48/+216 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-13 | 2 | -0/+40 |
|\| | |||||
| * | [Keymap] Userspace updates (#14418) | stanrc85 | 2021-09-13 | 2 | -0/+40 |
| | | |||||
* | | Move Bluetooth config to common_features.mk (#14404) | Ryan | 2021-09-12 | 1 | -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 Moulton | 2021-09-10 | 10 | -0/+482 |
| | |||||
* | [Keymap] Fix Drashna Keymap issues missed before Develop merge (#14271) | Drashna Jaelre | 2021-09-01 | 3 | -105/+113 |
| | |||||
* | [Keymap] hvp keymap for Cornelius, updated ut47.2 and userspace (#14187) | hvp | 2021-09-01 | 5 | -7/+120 |
| |