summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Add a `qmk format-json` command that will format JSON files (#12372)Zach White2021-03-2515-107/+319
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-259-0/+212
|\|
| * Added wilba.tech WT60-H2 (#12348)Wilba2021-03-259-0/+212
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-2518-0/+425
|\|
| * Added wilba.tech WT65-G2 (#12360)Wilba2021-03-259-0/+213
| * Added wilba.tech WT60-H3 (#12354)Wilba2021-03-259-0/+212
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-2514-103/+1077
|\|
| * (Re)Fixing K-type RGB lighting (#12084)Andrew-Fahmy2021-03-2514-103/+1077
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-259-0/+245
|\|
| * add equator (#12369)Brandon Claveria2021-03-259-0/+245
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-252-8/+8
|\|
| * Fix USER_PRINT on avr/atsam (#12269)Joel Challis2021-03-252-8/+8
* | Adding keyboard level weak function for slave matrix scan (#12317)XScorpion22021-03-252-1/+7
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-254-4/+4
|\|
| * Fix a small typo in cli_commands.md (#12379)Ryan Roden-Corrent2021-03-251-1/+1
| * Move `API_SYSEX_MAX_SIZE` out of `config_common.h` (#12302)Ryan2021-03-253-3/+3
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-256-70/+112
|\|
| * feat(keymaps): Changes to crkbd/keymaps/armand1m layout and README.md update ...Armando Magalhães2021-03-253-30/+72
| * Roses Lite layout macro touch-up (#12357)James Young2021-03-253-40/+40
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-251-0/+90
|\|
| * add valor_frl_tkl info.json (#12359)Xelus222021-03-241-0/+90
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-251-5/+5
|\|
| * [CI] Format code according to conventions (#12363)github-actions[bot]2021-03-241-5/+5
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-252-2/+2
|\|
| * [Keyboard] Preserve signedness from opt_encoder_handler for scroll data on pl...sbuller2021-03-242-2/+2
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-241-78/+84
|\|
| * More Tap Dance docs improvements (#12358)Ryan2021-03-241-78/+84
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-241-0/+18
|\|
| * Workaround for recent changes to mouse keycodes (#12367)Joel Challis2021-03-241-0/+18
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-2418-106/+614
|\|
| * Add support for qmk_configurator style aliases (#11954)Zach White2021-03-2418-106/+614
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-241-0/+96
|\|
| * Add info.json for handwired/datahand (#12320)Ryan2021-03-241-0/+96
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-247-0/+286
|\|
| * [Keyboard] YMDK YM68 (#12352)James Young2021-03-247-0/+286
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-241-69/+70
|\|
| * Configurator bugfix for GMMK Pro (#12353)James Young2021-03-241-69/+70
* | LED Matrix: Fix up eeconfig code (#12327)Ryan2021-03-242-26/+76
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-242-2/+2
|\|
| * Fix Uni660 linker errors (#12341)Ryan2021-03-242-2/+2
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-2410-0/+245
|\|
| * Add UC-1 keypad (#11926)duoshock2021-03-2410-0/+245
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-232-34/+50
|\|
| * Configurator fixes for handwired/concertina/64key (#12316)Viktor Eikman2021-03-232-34/+50
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-237-11/+351
|\|
| * Add Sinc Rev. 2 (#12138)Danny2021-03-237-11/+351
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-231-1/+1
|\|
| * Update readme.md on quefrency (#12276)Luca Di Bartolomeo2021-03-231-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-231-1/+9
|\|
| * use layout aliases when processing info.json (#12333)Zach White2021-03-221-1/+9