summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-0413-14/+340
|\
| * [Keyboard] Add Studio Kestra Nue PCB (#12094)studiokestra2021-03-0311-0/+330
| |
| * Remove ifdefs for Swap Hands keycodes (#12095)Drashna Jaelre2021-03-031-14/+10
| |
| * cannonkeys/atlas_alps: rename via keymaps rules.mk.txt to rules.mk (#12103)James Young2021-03-031-0/+0
| | | | | | File doesn't work without the correct filename.
| * Format code according to conventions (#12102)github-actions[bot]2021-03-031-53/+53
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Fixup line endings.Nick Brassel2021-03-041-53/+53
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-0312-0/+1245
|\|
| * [Keymap] sigma-squared (#11694)Signynt2021-03-0312-0/+1245
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-032-3/+25
|\|
| * Documentation changes SPLIT_USB_DETECT and hid_listen udev rules (#11665)individ-divided2021-03-032-3/+25
| | | | | | Co-authored-by: David Grundberg <david@quartz>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-038-0/+915
|\|
| * [Keyboard] Add Conone 65 (#11827)Evelien-Lillian Dekkers2021-03-038-0/+915
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-039-0/+395
|\|
| * [Keyboard] Add Keyboard Rartlite (#11866)labahuy2021-03-039-0/+395
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-031-3/+3
|\|
| * Update dichotomy/alairock layout (#12013)Skyler Lewis2021-03-031-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-032-0/+55
|\|
| * [Keyboard] Added VIA folder under the keymaps folder (#12021)Angel Rojas2021-03-032-0/+55
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-034-0/+535
|\|
| * [Keymap] Add grant24 Planck Rev 6 keymap (#12070)grant242021-03-034-0/+535
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keyboard] Enable RGB Matrix for Corne (#12091)Drashna Jaelre2021-03-033-2/+2
| |
* | Add support for complementary outputs to the WS2812 PWM driver (#11988)Sergey Vlasov2021-03-022-1/+13
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-034-0/+190
|\|
| * [Keymap] Add ddone's iris keymap (#12055)Ddone2021-03-024-0/+190
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-031-1/+1
|\|
| * [Docs] Small spelling mistake fix in leader keys (#12087)L3af2021-03-021-1/+1
| |
* | Format code according to conventions (#12088)github-actions[bot]2021-03-033-17/+16
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Split RGB Matrix (#11055)XScorpion22021-03-038-10/+86
| | | | | | | | | | * Split RGB Matrix * Suspend State sync for rgb matrix
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-022-14/+0
|\|
| * Remove more cruft from Lily58 default keymap (#12078)Dan Carroll2021-03-022-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | * Remove more cruft from lily58 default keymap * Update keyboards/lily58/keymaps/default/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update config.h Remove extra newline Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-021-1/+1
|\|
| * Set default for USB_SUSPEND_WAKEUP_DELAY to 0/disabled (#12081)Drashna Jaelre2021-03-021-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-021-0/+4
|\|
| * [Docs] MATRIX_MASKED docs for SPLIT_HAND_MATRIX_GRID (#11974)Trevor Elliott2021-03-011-0/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-021-21/+21
|\|
| * [Keyboard] Update eggman info.json (#12074)qpockets2021-03-011-21/+21
| | | | | | attempting to fix qmk configurator issues
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-021-1/+1
|\|
| * Fix the typo in ergodone 80 layout (#12075)Mega Mind2021-03-021-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-0214-1058/+103
|\|
| * Revert "Fixing K-type RGB lighting (#11551)" (#12065)Nick Brassel2021-03-0214-1058/+103
| | | | | | This reverts commit e6f7da403676b491ac278d5b793d18a0d114477e.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-011-9/+2
|\|
| * Fixing adjust layer issue with the lily58 default keymap (#12052)Dan Carroll2021-03-011-9/+2
| | | | | | | | | | | | | | * Fix triggering of adjust layer in default lily58 keymap * Remove unused extern * Swap raise/lower in update_tri_layer_state call to match recommendation in PR checklist
* | Format code according to conventions (#12076)github-actions[bot]2021-03-011-2/+2
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Add ability to toggle One Shot functionality (#4198)Drashna Jaelre2021-03-017-9/+81
| | | | | | | | Co-authored-by: Nick Brassel <nick@tzarc.org> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-0120-6/+551
|\|
| * Bastardkb added keyboard and renaming (#11887)Quentin2021-03-0120-6/+551
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-286-16/+88
|\|
| * Migrate make_dfu_header to CLI (#12061)Joel Challis2021-02-286-16/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | * Migrate make_dfu_header to CLI * lint fixes * Update lib/python/qmk/cli/generate/dfu_header.py Co-authored-by: Ryan <fauxpark@gmail.com> * Rename object Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-286-9/+9
|\|
| * Fix generated file output while target exists (#12062)Joel Challis2021-02-286-9/+9
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 04:34:38 +0000