summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-071-0/+82
|\
| * Add info.json for CK60i (#12318)Ryan2021-04-071-0/+82
* | Fix up builds that are now too big for `develop` branch. (#12495)Nick Brassel2021-04-063-0/+6
* | Add support for producing UF2-format binaries. (#12435)Nick Brassel2021-04-066-8/+373
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-041-1/+1
|\|
| * Disarray ProductID change (#12440)SneakboxKB2021-04-041-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-036-339/+353
|\|
| * [Keymap] cleanup keyboards/helix/{rev2|rev3_5rows}/keymaps/five_rows (#12259)Takeshi ISHII2021-04-046-339/+353
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-031-30/+35
|\|
| * Add WSL specific logic for avrdude device detection (#12392)Joel Challis2021-04-031-30/+35
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-031-1/+0
|\|
| * Remove `wave` from requirements-dev.txt (#12387)Excitable Snowball2021-04-031-1/+0
* | Format code according to conventions (#12467)github-actions[bot]2021-04-031-11/+11
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-0311-24/+676
|\|
| * fix line endingsZach White2021-04-033-56/+56
| * [nix] Use niv and poetry2nix to more easily manage dependencies (#11181)Steve Purcell2021-04-036-24/+611
| * 3 new LED effect animations (#9827)TurtleHunter2021-04-035-0/+65
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-0312-0/+1198
|\|
| * Added Epoch80 (#12307)kb-elmo2021-04-0312-0/+1198
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-04-032-77/+77
|\|
| * [CI] Format code according to conventions (#12468)github-actions[bot]2021-04-032-77/+77
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-033-24/+6
|\|
| * kingly_keys/ave: move RGBLight config to keyboard level (#12457)James Young2021-04-023-24/+6
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-033-3/+3
|\|
| * keymaps: fix kinesis default keymap progrm/reset keycode (#12429)Michael Stapelberg2021-04-023-3/+3
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-031-1/+5
|\|
| * [Keymap] Fixing userspace `rverst` (#12422)Robert Verst2021-04-021-1/+5
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-031-44/+15
|\|
| * [Keymap] Remove kc keymap from khord chocopad keymap (#12409)Dylan Khor2021-04-021-44/+15
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-033-2/+66
|\|
| * [Keyboard] Add GON NerD TKL VIA keymap (#12309)kaylanm2021-04-023-2/+66
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-039-0/+336
|\|
| * [Keyboard] Add pkb65 keyboard (#12230)MCKeebs2021-04-029-0/+336
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-033-2/+50
|\|
| * [Keyboard] KBD67 Hotswap VIA Support (#12351)MechMerlin2021-04-023-2/+50
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-039-0/+265
|\|
| * [Keyboard] Added wilba.tech WT70-JB (#12347)Wilba2021-04-029-0/+265
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-039-0/+298
|\|
| * [Keyboard] Added RAMA WORKS KARA (#12346)Wilba2021-04-029-0/+298
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-031-2/+2
|\|
| * [Keyboard] Update sixkeyboard VID/PID (#12345)jrdsgl2021-04-021-2/+2
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-031-70/+57
|\|
| * [Keymap] remove kc layout from levinson jyh keymap (#12301)Jason Yamada-Hanff2021-04-021-70/+57
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-032-0/+69
|\|
| * [Keyboard] Added VIA support to dmqdesign/spin (#12300)adamkraus62021-04-022-0/+69
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-0314-0/+437
|\|
| * [Keyboard] Add FoldKB (#12255)Danny2021-04-0214-0/+437
* | Big quantum_keycodes cleanup (#12249)Ryan2021-04-021-466/+417
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-039-0/+343
|\|
| * [Keyboard] Add Lumberjack keyboard (#12124)Paul James2021-04-029-0/+343