| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | Documentation: Fix links in key overrides (#14228) | coliss86 | 2021-08-31 | 1 | -1/+1 | |
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> | |||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-30 | 1 | -10/+10 | |
| |\| | ||||||
| | * | Update ws2812_spi.c (#14237) | JX | 2021-08-30 | 1 | -10/+10 | |
| | | | ||||||
| * | | Move feature suspend logic out of platform specific code (#14210) | Drashna Jaelre | 2021-08-30 | 4 | -179/+102 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-30 | 5 | -5/+170 | |
| |\| | ||||||
| | * | [Keyboard] Add Iris Rev. 5 (#13934) | Danny | 2021-08-30 | 5 | -5/+170 | |
| | | | | | | | | | 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-08-30 | 3 | -0/+583 | |
| |\| | ||||||
| | * | [Keymap] Add new snailmap keymap to nullbitsco/nibble keyboard (#14024) | dogspace | 2021-08-30 | 3 | -0/+583 | |
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-30 | 29 | -2/+1133 | |
| |\| | ||||||
| | * | [Keyboard] Add OwLab Jelly Epoch (#14190) | kb-elmo | 2021-08-30 | 20 | -2/+907 | |
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
| | * | [Keyboard] add slamz keyboard (#14188) | Rifaa Subekti | 2021-08-30 | 9 | -0/+226 | |
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-30 | 1 | -0/+1 | |
| |\| | ||||||
| | * | [Bug] Fix build error when enabling NO_HAPTIC_MOD (#14178) | Purdea Andrei | 2021-08-30 | 1 | -0/+1 | |
| | | | | | | | | | | | Without this build would fail, if a keyboard had haptic feedback enabled, TAPPING_TOGGLE was not overridden in a config.h, and if NO_HAPTIC_MOD was defined in config.h. | |||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-30 | 9 | -0/+375 | |
| |\| | ||||||
| | * | [Keyboard] add maker keyboards alexa (#14165) | Felix Jen | 2021-08-30 | 9 | -0/+375 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-30 | 1 | -0/+23 | |
| |\| | ||||||
| | * | [Keymap] Add peott-fr keymap for Kbd6x (#14164) | peott-fr | 2021-08-30 | 1 | -0/+23 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-30 | 2 | -1/+14 | |
| |\| | ||||||
| | * | [Keyboard] Changed ProductID on basketweav keyboards (#14162) | Vincent Vorholter | 2021-08-30 | 2 | -1/+14 | |
| | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Vince Vorholter <vince@28east.co.za> | |||||
| * | | Remove bin/qmk (#14231) | Zach White | 2021-08-29 | 14 | -114/+11 | |
| | | | | | | | | | | | * Remove the bin/qmk script * remove bin/qmk from workflows | |||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-29 | 1 | -1/+7 | |
| |\| | ||||||
| | * | ensure that the directory for sys.executable is in the user's path (#14229) | Zach White | 2021-08-29 | 1 | -1/+7 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-29 | 13 | -17/+16 | |
| |\| | ||||||
| | * | move everything from qmkfm/base_container to qmkfm/qmk_cli (#14230) | Zach White | 2021-08-29 | 13 | -17/+16 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-29 | 1 | -21/+21 | |
| |\| | ||||||
| | * | Nyquist (#14202) | peott-fr | 2021-08-29 | 1 | -21/+21 | |
| | | | | | | | | | | | | | | | | | | | * adding my Nyquist keymap * Updating Nyquist keymap with licensing. * Cleaning-up and improving Nyquist keymap. * Cleaning-up and improving Nyquist keymap. | |||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-29 | 3 | -74/+86 | |
| |\| | ||||||
| | * | Update the nix-shell environment (#13316) | Sergey Vlasov | 2021-08-29 | 3 | -74/+86 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Nix: Allow calls to `bin/qmk` even when the build was started by `qmk` The `$PATH` modifications performed by the Nix wrapper for the `qmk` executable prevent `bin/qmk` from working properly (the changed `$PATH` contains a wrong `python3` executable which does not have the needed Python modules in its module path). As a workaround, disable the generation of that wrapper for the `qmk` Python package (there is yet another wrapper generated while building the Python environment, which would still set the Python module path properly when running `qmk`). Although `bin/qmk` is officially deprecated, QMK CLI still invokes it in some cases (at least `qmk doctor` and `qmk pytest`), therefore keeping these invocations working is useful. * Nix: Update `util/nix/pyproject.toml` to match `requirements*.txt` Update the Python dependency information used by Poetry to match the current state of the qmk_firmware code. * Nix: Bump QMK CLI dependency to 1.0.0; bump other Python deps Update Python dependencies for nix-shell to the most recent releases: - dotty-dict: 1.3.0 -> no longer used - milc: 1.4.2 -> 1.6.2 - pep8-naming: 0.11.1 -> 0.12.1 - pygments: 2.9.0 -> 2.10.0 - pyrsistent: 0.17.3 -> 0.18.0 - pyusb: 1.1.1 -> 1.2.1 - setuptools-scm: 6.0.1 -> no longer used - qmk: 0.1.0 -> 1.0.0 - qmk-dotty-dict: not used -> 1.3.0.post1 - yapf: 0.30.0 -> 0.31.0 Note to self: The command to update Python dependencies changed to: ( cd util/nix && nix run 'nixpkgs#poetry' -- update --lock ) | |||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-29 | 9 | -0/+581 | |
| |\| | ||||||
| | * | [Keyboard] Add Viktus SP Mini (#14069) | J.Flanagan | 2021-08-29 | 9 | -0/+581 | |
| | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | |||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-29 | 6 | -11/+126 | |
| |\| | ||||||
| | * | [Keyboard] Corrected layout for np24 by YMDK (#14096) | Trent Hoh | 2021-08-29 | 6 | -11/+126 | |
| | | | | | | | | | 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-08-29 | 1 | -0/+97 | |
| |\| | ||||||
| | * | [Keymap] My Prime E keymap (#14117) | peott-fr | 2021-08-29 | 1 | -0/+97 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-29 | 9 | -0/+302 | |
| |\| | ||||||
| | * | [Keyboard] Add kelownaRGB64 (#14141) | Weirdo | 2021-08-29 | 9 | -0/+302 | |
| | | | | | | | | | 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-08-29 | 1 | -8/+19 | |
| |\| | ||||||
| | * | [Keyboard] fix compile error `make helix/rev2/sc:all` (#14214) | Takeshi ISHII | 2021-08-29 | 1 | -8/+19 | |
| | | | ||||||
| * | | fix automatic directory for qmk lint (#14215) | Zach White | 2021-08-28 | 1 | -5/+5 | |
| | | | ||||||
| * | | Add check for non-assignment code in rules.mk (#12108) | Zach White | 2021-08-29 | 1 | -41/+98 | |
| | | | | | | | | | | | | | | | | | | | | | | | * Add check for non-assignment code in rules.mk * fix lint check * fix lint * fixup to reflect the final state of #8422 * fix lint | |||||
| * | | remove qmk console, which is now part of the global cli (#14206) | Zach White | 2021-08-29 | 3 | -352/+0 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-29 | 1 | -1/+10 | |
| |\| | ||||||
| | * | Fixup upstream paths for submodules. (#14205) | Nick Brassel | 2021-08-29 | 1 | -1/+10 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-28 | 1 | -1/+1 | |
| |\| | ||||||
| | * | Bootmagic lite docs clarity. (#14204) | Nick Brassel | 2021-08-29 | 1 | -1/+1 | |
| | | | ||||||
| * | | add 'include keyboard_features.mk' into build_keyboard.mk (#8422) | Takeshi ISHII | 2021-08-29 | 2 | -0/+47 | |
| |/ | | | | | | | | | | | * add 'include keyboard_features.mk' into build_keyboard.mk keyboard_features.mk is a keyboard-local version of the functions performed by common_features.mk. * add comment into build_keyboard.mk * added description of keyboard_features.mk in hardware_keyboard_guidelines.md. * rename `keyboard_features.mk` to `post_rules.mk` | |||||
| * | Breaking changes develop merge to master, 2021Q3 edition. (#14196) | Nick Brassel | 2021-08-29 | 5477 | -60000/+76245 | |
| |\ | ||||||
| | * | 2021Q3 pre-merge `develop` changelog, keyboard aliases (#14198) | Nick Brassel | 2021-08-29 | 5 | -6/+683 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial changelog. * Data driven. * Submodule update. * Updated breaking changes docs. * Aliases. * Aliases. | |||||
| | * | [Docs] Add examples to RGB Matrix Indicators docs (#12797) | Drashna Jaelre | 2021-08-27 | 1 | -0/+39 | |
| | | | ||||||
| | * | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-26 | 9 | -0/+237 | |
| | |\ | |/ |/| | ||||||
 |
index : qmk_firmware | |
| [no description] |
| summaryrefslogtreecommitdiffstats |