Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-15 | 1 | -29/+22 |
|\ | |||||
| * | [Keyboard] Fix Jot50 compilation errors (#15478) | Drashna Jaelre | 2021-12-14 | 1 | -29/+22 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | Drashna Jael're | 2021-12-14 | 32 | -475/+475 |
|\| | |||||
| * | Remove unnecessary backslash-escapes in default keymaps (#15472) | Ryan | 2021-12-14 | 32 | -475/+475 |
| | | | | | | | | | | | | | | * Remove unnecessary backslash-escapes in default keymaps * Remove unnecessary backslash-escapes in via keymaps * Remove unnecessary backslash-escapes in default-ish keymaps | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-13 | 26 | -27/+39 |
|\| | |||||
| * | Fix up build options comments (#15463) | Ryan | 2021-12-12 | 26 | -27/+39 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into develop | fauxpark | 2021-12-09 | 182 | -320/+182 |
|\| | |||||
| * | Tidy up NKRO_ENABLE rules (#15382) | Ryan | 2021-12-09 | 182 | -319/+182 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-09 | 19 | -283/+0 |
|\| | |||||
| * | Remove empty config.h from default-ish keymaps (#15429) | Ryan | 2021-12-09 | 19 | -283/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | Drashna Jael're | 2021-12-08 | 18 | -91/+13 |
|\| | |||||
| * | Remove references to Makefile in keyboard-level rules.mk (#15427) | Ryan | 2021-12-07 | 19 | -93/+14 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-06 | 3 | -73/+137 |
|\| | |||||
| * | [Keymap] updates to own dactyl keymap (#14223) | Christian Eiden | 2021-12-06 | 3 | -73/+137 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-02 | 1 | -1/+0 |
|\| | |||||
| * | Remove pointless `CUSTOM_MATRIX = no` (#15383) | Ryan | 2021-12-02 | 1 | -1/+0 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into develop | fauxpark | 2021-12-02 | 174 | -339/+2 |
|\| | |||||
| * | Tidy up `SLEEP_LED_ENABLE` rules (#15362) | Ryan | 2021-12-01 | 174 | -339/+2 |
| | | |||||
* | | Convert not_so_minidox to SPLIT_KEYBOARD (#15306) | Joel Challis | 2021-12-01 | 10 | -929/+21 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-11-30 | 1 | -0/+2 |
|\| | |||||
| * | [Keyboard] Add missng define for 4x6 Tractyl Manuform (#15363) | Drashna Jaelre | 2021-12-01 | 1 | -0/+2 |
| | | |||||
* | | [Keyboard] Added Wakizashi 40 (#15336) | xiao | 2021-11-29 | 7 | -0/+268 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | [Core] Remove matrix_is_modified() and debounce_is_active() (#15349) | Stefan Kerkmann | 2021-11-29 | 5 | -36/+0 |
|/ | |||||
* | [Keymap] Unicode and cursor sync - drashna keymap (#15328) | Drashna Jaelre | 2021-11-28 | 8 | -37/+113 |
| | |||||
* | [Keyboard] Add Nozbe Macropad (#14803) | Leon Omelan | 2021-11-27 | 8 | -0/+193 |
| | | | | 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-11-24 | 3 | -130/+33 |
|\ | |||||
| * | Revert "handwired/split89 Layout Macro Refactor (#15210)" (#15284) | James Young | 2021-11-23 | 3 | -130/+33 |
| | | | | | | | | | | This reverts commit 26ae43219001dfe20aa525b6fb35f2aeb2b76617. Requested by jurassic73. | ||||
* | | Macros in JSON keymaps (#14374) | Zach White | 2021-11-22 | 5 | -0/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * macros in json keymaps * add advanced macro support to json * add a note about escaping macro strings * add simple examples * format json * add support for language specific keymap extras * switch to dictionaries instead of inline text for macros * use SS_TAP on the innermost tap keycode * add the new macro format to the schema * document the macro limit * add the json keyword for syntax highlighting * fix format that vscode screwed up * Update feature_macros.md * add tests for macros * change ding to beep * add json support for SENDSTRING_BELL * update doc based on feedback from sigprof * document host_layout * remove unused var * improve carriage return handling * support tab characters as well * Update docs/feature_macros.md Co-authored-by: Nick Brassel <nick@tzarc.org> * escape backslash characters * format * flake8 * Update quantum/quantum_keycodes.h Co-authored-by: Nick Brassel <nick@tzarc.org> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-11-19 | 1 | -61/+53 |
|\| | |||||
| * | Handwired Split65: Fix QMK Configurator Implementation (#15209) | James Young | 2021-11-19 | 1 | -61/+53 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | Drashna Jael're | 2021-11-19 | 3 | -33/+130 |
|\| | |||||
| * | handwired/split89 Layout Macro Refactor (#15210) | James Young | 2021-11-18 | 3 | -33/+130 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-11-17 | 3 | -3/+16 |
|\| | |||||
| * | [Keymap] updates for oled, and diablo 2 layer - Drashna (#15194) | Drashna Jaelre | 2021-11-17 | 3 | -3/+16 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-11-17 | 4 | -84/+95 |
|\| | |||||
| * | handwired/myskeeb Layout Macro Refactor (#15181) | James Young | 2021-11-16 | 4 | -84/+95 |
| | | | | | | | | | | | | | | | | | | | | | | * handwired/myskeeb: update key positions in info.json * remove unused matrix positions L26 and R20 aren't physically present on the keyboard. * add image to readme file * add supported hardware and flashing example to readme | ||||
* | | Require explicit enabling of RGB Matrix modes (#15018) | Drashna Jaelre | 2021-11-15 | 4 | -0/+193 |
| | | |||||
* | | Rework and expand Pointing Device support (#14343) | Drashna Jaelre | 2021-11-14 | 5 | -76/+24 |
| | | | | | | Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> | ||||
* | | [Keyboard] Stream cheap via fixes/updates (#14325) | Luigi311 | 2021-11-10 | 3 | -12/+29 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-11-10 | 7 | -31/+23 |
|\| | |||||
| * | Updates to drashna keymap and minor updates to tractyl manuform (#15101) | Drashna Jaelre | 2021-11-10 | 7 | -31/+23 |
| | | |||||
* | | Remove `BOOTMAGIC_ENABLE = lite` option (#15002) | James Young | 2021-11-05 | 89 | -89/+89 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove BOOTMAGIC_ENABLE=lite setting * change keyboard BOOTMAGIC_ENABLE rules Edits keyboard-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`. * change keyboard BOOTMAGIC_ENABLE inline comments Edits keyboard-level BOOTMAGIC_ENABLE inline comments to "Enable Bootmagic Lite". * change keymap BOOTMAGIC_ENABLE rules Edits keymap-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`. * change keymap BOOTMAGIC_ENABLE inline comments Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite". * change layout/user BOOTMAGIC_ENABLE rules/comments Edits instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`. Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite". * update non-rules.mk BOOTMAGIC_ENABLE references in keyboards/ * remove docs references to Full Bootmagic * convert data-driven Bootmagic Lite instances * remove Bootmagic Lite bodge from data-driven generation * Merge remote-tracking branch 'upstream/develop' into rm/bootmagic-full_q4a * update docs/ja/config_options.md per mtei * update docs/faq_misc.md per mtei Remove remaining Full Bootmagic reference. | ||||
* | | Map `PRODUCT` define to `keyboard_name` (#14372) | Ryan | 2021-11-05 | 3 | -14/+16 |
| | | | | | | | | | | | | | | * Map `PRODUCT` define to `keyboard_name` * Fix tests * Fix last test | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-11-04 | 1 | -6/+6 |
|\| | |||||
| * | [Keyboard] Layout update to split89.h (#14930) | jurassic73 | 2021-11-03 | 1 | -6/+6 |
| | | |||||
* | | [Core] Change OLED task function to be boolean (#14864) | Drashna Jaelre | 2021-11-02 | 15 | -111/+129 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | * [Core] Add kb level callbacks to OLED driver * Update keyboards and keymaps * Update docs * Update userspace configs * Add fix for my keymap ... * update lefty | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-29 | 2 | -8/+7 |
|\| | |||||
| * | [Keymap] ajp10304: add mouse scroll keys (#14953) | Alan Pocklington | 2021-10-29 | 2 | -8/+7 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-26 | 2 | -2/+0 |
|\| | |||||
| * | Remove unused KEYBOARD_LOCK_ENABLE from rules (#14920) | Drashna Jaelre | 2021-10-25 | 2 | -2/+0 |
| | |