Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into develop | Drashna Jael're | 2022-01-21 | 18 | -152/+371 |
|\ | |||||
| * | [Keyboard] add fuji65 keyboard (#15765) | CMMS-Freather | 2022-01-21 | 9 | -0/+331 |
| | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
| * | [Keymap] Drashna's OLED rewrite (#15981) | Drashna Jaelre | 2022-01-21 | 10 | -152/+41 |
| | | |||||
* | | [Keyboard] Sol 3 Keyboard from RGBKB (#15687) | XScorpion2 | 2022-01-21 | 25 | -14/+1268 |
| | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Franklyn Tackitt <franklyn@tackitt.net> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-21 | 2 | -2/+2 |
|\| | |||||
| * | Update keymap on the TS60 (#15963) | Wolf Van Herreweghe | 2022-01-21 | 2 | -2/+2 |
| | | | | | | Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-20 | 1 | -32/+1 |
|\| | |||||
| * | Remove community-supported keyboards list from readme (#15957) | Ryan | 2022-01-20 | 1 | -32/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-20 | 15 | -0/+614 |
|\| | |||||
| * | [Keyboard] add Plexus75_HE (#15634) | npspears | 2022-01-20 | 15 | -0/+614 |
| | | | | | | | | 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 | 2022-01-19 | 3 | -5/+18 |
|\| | |||||
| * | Small code improvements, fix KVM switch issues with GMMK Pro on andrebrait's ↵ | Andre Brait | 2022-01-19 | 3 | -5/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | keymap (#15943) * Add LED table * Make constants constant * Disable Mousekey to fix issues with KVM Fixes #15939 * Update GMMK/pro/ansi/andrebrait README | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-19 | 2 | -10/+5 |
|\| | |||||
| * | Fixup build. (#15931) | Nick Brassel | 2022-01-19 | 2 | -10/+5 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-19 | 12 | -12/+0 |
|\| | |||||
| * | Remove `keyboard_folder` instances from `info.json` files (#15932) | James Young | 2022-01-19 | 12 | -12/+0 |
| | | | | | | | | | | | | | | | | | | | | | | * remove `keyboard_folder` instance from caffeinated/serpent65 * remove `keyboard_folder` instances from dumbpad * remove `keyboard_folder` instances from mlego directory * remove `keyboard_folder` instance from neopad/rev1 * remove `keyboard_folder` instance from spaceman/pancake/rev2 | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-17 | 1 | -1/+1 |
|\| | |||||
| * | [Keyboard] fix odin rgb light error (#15914) | moyi4681 | 2022-01-17 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-17 | 6 | -2/+11 |
|\| | |||||
| * | Add LAYOUTS entry to rules.mk (#15900) | Albert Y | 2022-01-17 | 6 | -2/+11 |
| | | | | | | | | | | | | | | | | | | * Add layouts to rules.mk * Remove excess settings. Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Joel Challis <git@zvecr.com> | ||||
* | | CLI: Parse USB device version BCD (#14580) | Ryan | 2022-01-17 | 36 | -46/+46 |
| | | | | | | | | | | * CLI: Parse USB device version BCD * Apply suggestions | ||||
* | | Yet another bad `DEFAULT_FOLDER` fix. (#15904) | Nick Brassel | 2022-01-16 | 1 | -1/+1 |
| | | |||||
* | | move yd60mq to ymdk vendor folder (#15647) | peepeetee | 2022-01-17 | 18 | -6/+6 |
| | | |||||
* | | rename idobo to idobao/id75, move to vendor folder (#15661) | peepeetee | 2022-01-17 | 49 | -6/+8 |
| | | | | | | | | | | | | | | * rename idobo to idobao/id75, move to vendor folder * add image, amend readme to id75 * add buying link | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-15 | 1 | -3/+2 |
|\| | |||||
| * | Fix dactyl manuform 6x6 LAYOUT_6x6_5_thumb rendering (#15891) | Bartosz Nowak | 2022-01-15 | 1 | -3/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-15 | 1 | -21/+1 |
|\| | |||||
| * | [Keyboard] Fix compilation issues for mechlovin hex4b (#15885) | Drashna Jaelre | 2022-01-14 | 1 | -21/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-15 | 12 | -0/+512 |
|\| | |||||
| * | [Keyboard] Add Rosaline (#15595) | Paul James | 2022-01-14 | 12 | -0/+512 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-15 | 14 | -0/+758 |
|\| | |||||
| * | [Keyboard] Add Devil68 Pro (#15820) | HorrorTroll | 2022-01-14 | 14 | -0/+758 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-15 | 2 | -0/+6 |
|\| | |||||
| * | [Keyboard] Fix encoder bug zoom65 and zoom65_litte (#15876) | GG | 2022-01-14 | 2 | -0/+6 |
| | | |||||
* | | Fix broken bootloader builds in develop. (#15880) | Dasky | 2022-01-15 | 9 | -1/+13 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-14 | 3 | -0/+119 |
|\| | |||||
| * | [Keymap] added keymap conor with rgb layers (#15234) | Conor Burns | 2022-01-14 | 3 | -0/+119 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-14 | 63 | -136/+3255 |
|\| | |||||
| * | [Keyboard] Add Keychron_q1 rev_0101 and Keychron q2 series (#15025) | lalalademaxiya1 | 2022-01-14 | 63 | -136/+3255 |
| | | | | | | | | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Cesar Rojas <cesar.fieoner@gmail.com> Co-authored-by: lokher <lokher@gmail.com> Co-authored-by: Adam Karim <adam@akarsoft.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-14 | 10 | -0/+415 |
|\| | |||||
| * | [keyboard] Adding Atlas_65 (#15839) | Ryan Smith | 2022-01-13 | 10 | -0/+415 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-14 | 13 | -658/+606 |
|\| | |||||
| * | [Keymap] ericgebhart keymap and userspace updates (#15727) | Eric Gebhart | 2022-01-13 | 13 | -658/+606 |
| | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> Co-authored-by: Drashna Jael're <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-14 | 2 | -0/+129 |
|\| | |||||
| * | [Keyboard] Add VIA support for the Drop Alt (#15857) | asdfire1 | 2022-01-13 | 2 | -0/+129 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-14 | 22 | -1/+802 |
|\| | |||||
| * | [Keyboard] and CB87v2 and CB87RGB and fixed CB1800 and CB87 (#15824) | DA | 2022-01-13 | 22 | -1/+802 |
| | | | | | | | | 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 | 2022-01-14 | 2 | -11/+113 |
|\| | |||||
| * | [Keyboard] Fixing dactyl manuform 6x6 warnings (#15868) | Bartosz Nowak | 2022-01-13 | 2 | -11/+113 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 1 | -0/+80 |
|\| |