summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-251-0/+48
|\
| * [Keymap] ANAVI Macro Pad 2 add git keymap (#12212)Leon Anavi2021-03-251-0/+48
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-252-0/+14
|\|
| * Add RGB Matrix suspend wake functions to BM40 (#12246)Albert Y2021-03-252-0/+14
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-251-0/+131
|\|
| * add massdrop/alt/hlmtre keymap, add .exe to gitignore (#12191)Matt W2021-03-251-0/+131
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-2510-2/+297
|\|
| * Add Daisy, a macropad with dual rotary encoders + update Scarlet readme.md (#...Blake2021-03-258-2/+285
| * Add suspend wake functions for The Mark:65's RGB Matrix (#12245)Albert Y2021-03-252-0/+12
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-251-10/+13
|\|
| * Fix handling multiples of the same MIDI note (fixes bug brought up in issue #...jakobkg2021-03-251-10/+13
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-255-13/+6
|\|
| * TKC GodSpeed75: add RGB LED support (#12278)TerryMathews2021-03-255-13/+6
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-253-0/+57
|\|
| * add via support for bm68rgb (#12275)peepeetee2021-03-253-0/+57
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-2518-0/+647
|\|
| * Add XT65 keyboard (#11998)kopibeng2021-03-259-0/+415
| * added twelvekey (#12281)kb-elmo2021-03-259-0/+232
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-253-15/+15
|\|
| * ISO Layouts fix (#12319)Matteo Montemarani2021-03-253-15/+15
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-251-32/+4
|\|
| * update shell.nix (#12295)André Silva2021-03-251-32/+4
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-252-6/+6
|\|
| * Improve upon the 'Caveats' section of the Layers and Mod-Tap documentation (#...Purdea Andrei2021-03-252-6/+6
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-251-15/+15
|\|
| * handwired/bolek: correct key object order (#12356)James Young2021-03-251-15/+15
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-2515-107/+319
|\|
| * 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