Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix broken bootloader builds in develop. (#15880) | Dasky | 2022-01-15 | 10 | -1/+17 |
| | |||||
* | 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 | 1 | -1/+1 |
|\| | |||||
| * | Make note of upper limit for `UC()` (#15870) | Ryan | 2022-01-14 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-14 | 1 | -2/+0 |
|\| | |||||
| * | Remove network drive mapping comment for WSL (#15871) | Ryan | 2022-01-14 | 1 | -2/+0 |
| | | |||||
* | | 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 | 35 | -2001/+4223 |
|\| | |||||
| * | [Keymap] ericgebhart keymap and userspace updates (#15727) | Eric Gebhart | 2022-01-13 | 35 | -2001/+4223 |
| | | | | | | | | | | 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 | -1/+1 |
|\| | |||||
| * | Fix keymap.json macro example (#15567) | Tuk Bredsdorff | 2022-01-13 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 1 | -0/+80 |
|\| | |||||
| * | Adding Quefrency keymap (#15852) | peott-fr | 2022-01-13 | 1 | -0/+80 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 1 | -26/+28 |
|\| | |||||
| * | [Keyboard] Fix xox70hot via layout (#15863) | Drashna Jaelre | 2022-01-13 | 1 | -26/+28 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 11 | -0/+548 |
|\| | |||||
| * | [Keyboard] Add UM-A Keyboard (#15584) | duoshock | 2022-01-13 | 11 | -0/+548 |
| | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: online <33636898+online@users.noreply.github.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 21 | -0/+2879 |
|\| | |||||
| * | [Keymap] Lily58 : HELL0 NAVI. Interface (#15469) | druotoni | 2022-01-13 | 21 | -0/+2879 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 12 | -0/+554 |
|\| | |||||
| * | [Keyboard] Atlantis AK81_VE support (#15392) | fOmey | 2022-01-13 | 12 | -0/+554 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 15 | -2/+487 |
|\| | |||||
| * | [Keyboard] HoodrowG PCB (#15474) | Andrew Kannan | 2022-01-13 | 9 | -0/+278 |
| | | | | | | | | | | Co-authored-by: Julian <julianzabala1@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
| * | [Keyboard] new layout for squiggle (#15683) | Ibnu Daru Aji | 2022-01-13 | 6 | -2/+209 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 18 | -0/+998 |
|\| | |||||
| * | [Keyboard] Add Dactyl Manuform 6x6_4 and Kinesis keyboards (#15475) | Dmitriy Kuminov | 2022-01-13 | 14 | -0/+611 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
| * | [Keymap] Kyria new custom keymap lw (#15729) | Lucas W | 2022-01-13 | 4 | -0/+387 |
| | | |||||
* | | move winry25tc to winry/ (#15637) | peepeetee | 2022-01-13 | 7 | -5/+10 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 19 | -735/+0 |
|\| | |||||
| * | [Keyboard] remove duplicate m65 (#15831) | Alin Marin Elena | 2022-01-13 | 19 | -735/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 3 | -46/+84 |
|\| | |||||
| * | [Keyboard] move enum_layers in keymaps, in sync with the other mlego/m* (#15832) | Alin Marin Elena | 2022-01-13 | 3 | -46/+84 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 17 | -71/+74 |
|\| | |||||
| * | [Keymap] Misc userspace and keymap improvements (#15844) | Reibl János Dániel | 2022-01-13 | 6 | -53/+50 |
| | | |||||
| * | [Keyboard] Switch a_dux, cradio and ferris to split_3x5_2 (#15850) | Albert Y | 2022-01-13 | 11 | -18/+24 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 4 | -4/+101 |
|\| | |||||
| * | [Keyboard] Fix Simpler6x boards (#15862) | Drashna Jaelre | 2022-01-13 | 4 | -4/+101 |
| | | | | | | | | | | * [Keyboard] Fix simpler64 * [Keyboard] Fix simpler61 | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-13 | 10 | -0/+385 |
|\| | |||||
| * | [Keymap] Add personal keymap to GMMK Pro ANSI (#15314) | Choi Byungyoon | 2022-01-12 | 10 | -0/+385 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | PMW3389 Revert Firmware load during Initilization (#15859) | Alabastard-64 | 2022-01-13 | 2 | -5/+2 |
| | |