Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-10 | 36 | -36/+0 |
|\ | |||||
| * | Remove BLUETOOTH_ENABLE from defaultish keymaps (#14375) | Ryan | 2021-09-10 | 36 | -36/+0 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into develop | fauxpark | 2021-09-10 | 97 | -101/+99 |
|\| | |||||
| * | Change USBasp and bootloadHID bootloaders to lowercase (#14354) | Ryan | 2021-09-10 | 97 | -101/+99 |
| | | |||||
* | | Move non-assignment code to post_rules.mk (#14207) | Zach White | 2021-09-09 | 34 | -155/+144 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 40percentclub/ut47: move non-assignment code to post_rules.mk * converter/palm_usb: move non-assignment code to post_rules.mk * converter/sun_usb: move non-assignment code to post_rules.mk * dm9records/ergoinu: move non-assignment code to post_rules.mk * ergotaco: move non-assignment code to post_rules.mk * handwired/symmetric70_proto: move non-assignment code to post_rules.mk * hhkb/ansi: move non-assignment code to post_rules.mk * hhkb/jp: move non-assignment code to post_rules.mk * lfkeyboards/lfk78: move non-assignment code to post_rules.mk * lfkeyboards/lfk87: move non-assignment code to post_rules.mk * lfkeyboards/lfkpad: move non-assignment code to post_rules.mk * lfkeyboards/mini1800: move non-assignment code to post_rules.mk * manta60: move non-assignment code to post_rules.mk * mschwingen/modelm: move non-assignment code to post_rules.mk * newgame40: move non-assignment code to post_rules.mk * numatreus: move non-assignment code to post_rules.mk * rgbkb/zen: move non-assignment code to post_rules.mk * rgbkb/zen/rev2: move non-assignment code to post_rules.mk * Revert "handwired/symmetric70_proto: move non-assignment code to post_rules.mk" This reverts commit cffaf0075c3c9b2473a660ba4af8835a9162311b. | ||||
* | | Fix number of elements in info.json does not match errors (#14213) | Zach White | 2021-09-09 | 11 | -489/+406 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * evyd13/atom47/rev3: best guess at fixing info.json * evyd13/atom47: best guess at fixing info.json * eyeohdesigns/sprh: best guess at fixing info.json * handwired/unicomp_mini_m: best guess at fixing info.json * lazydesigners/the60/rev2: best guess at fixing info.json * melgeek/mj6xy: best guess at fixing info.json * pizzakeyboards/pizza65: best guess at fixing info.json * plx: best guess at fixing info.json * rojectcain/vault45: best guess at fixing info.json * sidderskb/majbritt/rev2: best guess at fixing info.json * spacey: best guess at fixing info.json | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-10 | 765 | -5233/+34 |
|\| | |||||
| * | Remove bootloader listings from rules.mk (#14330) | Ryan | 2021-09-10 | 765 | -5233/+34 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-10 | 17 | -17/+0 |
|\| | |||||
| * | Remove commented out BLUETOOTH_ENABLE rules (#14361) | Ryan | 2021-09-10 | 17 | -17/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-09 | 11 | -0/+706 |
|\| | |||||
| * | [Keyboard] Add custom pcb for Polaris (#14347) | Uy Bui | 2021-09-09 | 11 | -0/+706 |
| | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] pcb for Polaris * [Keyboard] pcb for Polaris: update layout * Update keyboards/wekey/polaris/info.json Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'upstream/master' into develop | fauxpark | 2021-09-09 | 1 | -17/+17 |
|\| | |||||
| * | Fix CRLF in lyra/rev1 (#14360) | Ryan | 2021-09-09 | 1 | -17/+17 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-09 | 15 | -0/+540 |
|\| | |||||
| * | [Keyboard] add lyra (#13977) | Malevolti | 2021-09-08 | 15 | -0/+540 |
| | | | | | | | | 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 | 2021-09-09 | 13 | -0/+926 |
|\| | |||||
| * | [Keyboard] Add Olly JF PCB (#14056) | mechlovin | 2021-09-08 | 13 | -0/+926 |
| | | | | | | | | 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 | 2021-09-09 | 1 | -4/+4 |
|\| | |||||
| * | [Keymap] Fix Maker Keyboards Alexa Keymap (#14355) | Felix Jen | 2021-09-08 | 1 | -4/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-09 | 9 | -0/+423 |
|\| | |||||
| * | [Keyboard] Add 61Key (#14259) | Ethan Yates | 2021-09-08 | 9 | -0/+423 |
| | | | | | | | | 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 | 2021-09-09 | 2 | -14/+14 |
|\| | |||||
| * | [Keyboard] Minor tweaks to Work Board layout (#14351) | Drashna Jaelre | 2021-09-08 | 2 | -14/+14 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-09 | 1 | -1/+1 |
|\| | |||||
| * | Bugfix for Joystick and JSON schema (#14295) | Ryan | 2021-09-09 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-08 | 9 | -0/+295 |
|\| | |||||
| * | [Keyboard] Add new Mokey keyboard (#14329) | rhmokey | 2021-09-08 | 9 | -0/+295 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-08 | 4 | -0/+160 |
|\| | |||||
| * | [Keymap] Add Gaston's Lily58 custom keymap (#14334) | Gastón Jorquera | 2021-09-08 | 4 | -0/+160 |
| | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Gaston Jorquera <gjorquera@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-08 | 11 | -118/+141 |
|\| | |||||
| * | [Keyboard] Tractyl Manuform - configuration updates (#14314) | Drashna Jaelre | 2021-09-08 | 11 | -118/+141 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] Tractyl Manuform - configuration updates * Update readmes * Add more details * Fix issues with encoder pins * Additional fixes for pin config * Fix up some comments | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-08 | 2 | -0/+56 |
|\| | |||||
| * | [Keyboard] Add VIA keymap for the reviung39 (#14234) | Keenan Brock | 2021-09-08 | 2 | -0/+56 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-08 | 4 | -5/+6 |
|\| | |||||
| * | Fixes for recent i2c migrations (#14352) | Joel Challis | 2021-09-08 | 4 | -5/+6 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-08 | 1 | -20/+20 |
|\| | |||||
| * | [Keyboard] Update VIA support for lazydesigners/the40 (#14240) | jackytrabbit | 2021-09-08 | 1 | -20/+20 |
| | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-08 | 4 | -0/+268 |
|\| | |||||
| * | [Keymap] New keymap for bm40 (#14182) | Gabriel Bustamante | 2021-09-07 | 4 | -0/+268 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-08 | 9 | -0/+224 |
|\| | |||||
| * | [Keyboard] add wang ergo (#14245) | Rifaa Subekti | 2021-09-07 | 9 | -0/+224 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-08 | 5 | -15/+15 |
|\| | |||||
| * | Sneakbox Ava tidy-up (#14298) | James Young | 2021-09-07 | 5 | -15/+15 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-08 | 4 | -0/+203 |
|\| | |||||
| * | [Keymap] Adding IFo Hancroft's ErgoDox EZ Keymap (#14342) | IFo Hancroft | 2021-09-07 | 4 | -0/+203 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-08 | 1 | -11/+10 |
|\| | |||||
| * | [Keyboard] Fix issues with 3w6 rev2 matrix (#14346) | Drashna Jaelre | 2021-09-08 | 1 | -11/+10 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-08 | 6 | -442/+52 |
|\| | |||||
| * | handwired/dactyl - Refactor use of legacy i2c implementation (#14344) | Joel Challis | 2021-09-07 | 6 | -442/+52 |
| | |