Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into develop | Drashna Jael're | 2021-11-13 | 3 | -23/+24 |
|\ | |||||
| * | Fix hebrew emoji in langs.md (#15140) | peepeetee | 2021-11-13 | 1 | -1/+1 |
| | | |||||
| * | [Keyboard] Add space between Cradio info.json layout (#15127) | Albert Y | 2021-11-13 | 1 | -22/+22 |
| | | | | | | Co-authored-by: filterpaper <filterpaper@localhost> | ||||
| * | add wait to unicode for win (#15061) | Markus Fritsche | 2021-11-12 | 1 | -0/+1 |
| | | | | | | Co-authored-by: Markus Fritsche <fritsche.markus@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-11-12 | 1 | -13/+10 |
|\| | |||||
| * | [Docs] Correct logic of tap hold statement (#14992) | Albert Y | 2021-11-12 | 1 | -13/+10 |
| | | | | | | Co-authored-by: filterpaper <filterpaper@localhost> | ||||
* | | matrix/abelx - Update ChibiOS conf files (#15130) | Joel Challis | 2021-11-13 | 3 | -1299/+70 |
| | | | | | | | | | | * Fix obsolete or unknown configuration file * use qmk chibios-confmigrate | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-11-12 | 10 | -0/+206 |
|\| | |||||
| * | [Keyboard] Add JadooKB JKB2 (#15036) | WiZ.GG | 2021-11-12 | 10 | -0/+206 |
| | | | | | | | | 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-11-12 | 10 | -22/+402 |
|\| | |||||
| * | [Keyboard] Update a_dux info.json (#15126) | Albert Y | 2021-11-12 | 1 | -22/+22 |
| | | | | | | Co-authored-by: filterpaper <filterpaper@localhost> | ||||
| * | [Keyboard] Add Chalice Support (#15106) | Josh Johnson | 2021-11-12 | 9 | -0/+380 |
| | | | | | | | | 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-11-12 | 1 | -0/+3 |
|\| | |||||
| * | [Docs] Codify not using code from other keyboards in PRs (#15128) | Drashna Jaelre | 2021-11-12 | 1 | -0/+3 |
| | | | | | | | | | | * [Docs] Codify not using code from other keyboards in PRs * add additional comments | ||||
* | | gcc10 LTO - Only specify adhlns assembler options at link time (#15115) | Joel Challis | 2021-11-12 | 1 | -24/+26 |
| | | | | | | | | | | * gcc10 LTO - Only specify adhlns assembler options at link time * Default adhlns off? | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-11-12 | 2 | -26/+74 |
|\| | |||||
| * | Fix obsolete or unknown configuration file (#15129) | Joel Challis | 2021-11-12 | 2 | -26/+74 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-11-11 | 2 | -3/+3 |
|\| | |||||
| * | Avoid MATRIX_*_PINS due to schema validation errors (#15123) | Joel Challis | 2021-11-12 | 2 | -3/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-11-11 | 4 | -13/+110 |
|\| | |||||
| * | Update Gergoplex keymap (#15111) | George Petri | 2021-11-11 | 4 | -13/+110 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | * fix wrong config * start work on gaming layer * mod tap per key * tap dance to game layer * impl game layer * add double quotes and underline | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-11-11 | 3 | -22/+22 |
|\| | |||||
| * | [Keyboard] Reduce compiled size for pk64rgb's via keymap (#15118) | Drashna Jaelre | 2021-11-11 | 3 | -22/+22 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-11-11 | 2 | -45/+44 |
|\| | |||||
| * | [Keyboard] Fix compilation issues for Krush boards (#15117) | Drashna Jaelre | 2021-11-11 | 2 | -45/+44 |
| | | |||||
* | | [Keyboard] Fix compilation issues for Lime (#15116) | Drashna Jaelre | 2021-11-11 | 2 | -1/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-11-11 | 15 | -0/+1343 |
|\| | |||||
| * | [Keyboard] Lime by HellTM (#14710) | HellTM | 2021-11-10 | 15 | -0/+1343 |
| | | | | | | | | 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-11-11 | 3 | -1/+114 |
|\| | |||||
| * | [Keymap] Adding keymap for BDN9 and Planck (#15067) | Gustavs Gūtmanis | 2021-11-10 | 3 | -1/+114 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-11-11 | 63 | -0/+3293 |
|\| | |||||
| * | [Keyboard] Added Krush Solder (60% & 65%) (#15074) | Sắn | 2021-11-10 | 63 | -0/+3293 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-11-10 | 2 | -14/+31 |
|\| | |||||
| * | [Keyboard] Fix compilation issues for teleport numpad (#15110) | Drashna Jaelre | 2021-11-10 | 2 | -14/+31 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-11-10 | 2 | -10/+11 |
|\| | |||||
| * | [Keyboard] Add Paroxysm keyboard to Cradio (#15097) | Albert Y | 2021-11-10 | 2 | -10/+11 |
| | | | | | | Co-authored-by: filterpaper <filterpaper@localhost> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-11-10 | 1 | -2/+2 |
|\| | |||||
| * | [Keyboard] Update mb44.h (#15092) | melonbred | 2021-11-10 | 1 | -2/+2 |
| | | |||||
* | | [Keyboard] Stream cheap via fixes/updates (#14325) | Luigi311 | 2021-11-10 | 3 | -12/+29 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-11-10 | 10 | -0/+489 |
|\| | |||||
| * | [Keyboard] PK64RGB Keyboard Addition (#14627) | Barry Huang | 2021-11-10 | 10 | -0/+489 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-11-10 | 9 | -0/+329 |
|\| | |||||
| * | [Keyboard] Element Hotswap PCB (#15082) | MechMerlin | 2021-11-10 | 9 | -0/+329 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-11-10 | 9 | -0/+227 |
|\| | |||||
| * | [Keyboard] Teleport numpad (#14905) | Moritz | 2021-11-10 | 9 | -0/+227 |
| | | | | | | | | 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-11-10 | 11 | -62/+693 |
|\| | |||||
| * | Updates to drashna keymap and minor updates to tractyl manuform (#15101) | Drashna Jaelre | 2021-11-10 | 11 | -62/+693 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into develop | James Young | 2021-11-09 | 5 | -9/+14 |
|\| | |||||
| * | Update noroadsleft userspace and keymaps (2021-11-09) (#15099) | James Young | 2021-11-09 | 5 | -10/+15 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-11-08 | 5 | -51/+163 |
|\| |