summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Keyboards/RGBKB/Mün (#13239)XScorpion22021-06-2527-0/+2049
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-2611-0/+248
|\
| * [Keyboard] Add NK1 (#13212)yiancar2021-06-2511-0/+248
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: yiancar <yiancar@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-264-341/+123
|\|
| * FFKeebs Siris Configurator Layout Correction (#13328)James Young2021-06-254-341/+123
| | | | | | | | | | | | | | | | | | * physically arrange layout macro Arranges the layout macro and keycodes to resemble the assembled keyboard. * correct info.json data Corrects the key sequence and positioning in info.json.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-2610-0/+312
|\|
| * [Keyboard] Add Gvalchca GA15.0 (#13114)Gvalch-ca2021-06-2510-0/+312
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-261-0/+3
|\|
| * [Keyboard] Enable RGB Matrix VIA side for Pachi RGB (#13308)Xelus222021-06-251-0/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-268-39/+87
|\|
| * [Keyboard] Bugfixes and Readme additions for PloopyCo devices (#13043)Drashna Jaelre2021-06-258-39/+87
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-261-80/+84
|\|
| * SENDYYeah Bevi: correct Configurator layout data (#13327)James Young2021-06-251-80/+84
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-261-1344/+276
|\|
| * Nix Studio Oxalys80 Configurator Layout Data Correction (#13326)James Young2021-06-251-1344/+276
| | | | | | | | | | | | | | * apply human-friendly formatting to info.json * correct LAYOUT_all data Corrects the layout data for the LAYOUT_all macro.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-263-4/+7
|\|
| * Draytronics Daisy Configurator Refactor (#13325)James Young2021-06-253-4/+7
| | | | | | | | | | | | | | | | | | * correct layout data * use LAYOUT as layout macro name The defined LAYOUT_daisy is functional, but Configurator expects LAYOUT through the info.json file. As the board only supports one layout according to the open-source PCB files, use LAYOUT as the defined macro per QMK guidelines. * add layout macro alias
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-265-80/+440
|\|
| * GON Nerd60 Refactor (#13343)James Young2021-06-265-80/+440
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-2649-357/+357
|\|
| * Cleanup junk chars, part 3 (#13332)Ryan2021-06-2649-357/+357
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-2519-232/+232
|\|
| * Cleanup junk chars, part 2 (#13284)Ryan2021-06-2519-232/+232
| |
* | Optimize our jsonschema by using refs (#13271)Zach White2021-06-249-310/+351
| | | | | | | | | | | | | | | | | | | | | | | | | | * fix some broken info.json files * optimize our jsonschema using refs * fix formatting after vscode broke it * make flake8 happy * cleanup * make our schema validation more compact and flexible
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-251-1/+2
|\|
| * add doctor to safe_commands (#13324)Zach White2021-06-241-1/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-243-1/+85
|\|
| * Bop added via & unicode support (#13122)Nathan_Blais2021-06-253-1/+85
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-241-17/+20
|\|
| * Update Japanese document (#10673)shela2021-06-241-17/+20
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-244-199/+209
|\|
| * [Docs] Update Japanese faq documents (#12842)shela2021-06-244-199/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update Japanese faq documents. * Update Japanese summary. * Update docs/ja/faq_debug.md Co-authored-by: s-show <s1shimz@gmail.com> * Update docs/ja/faq_misc.md Co-authored-by: s-show <s1shimz@gmail.com> * Apply suggestions from code review Co-authored-by: s-show <s1shimz@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-242-58/+114
|\|
| * Update Japanese newbs_getting_started.md (#12841)shela2021-06-242-58/+114
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-244-115/+109
|\|
| * SAM SG81M Layout Macro Rework (#13291)James Young2021-06-234-115/+109
| | | | | | | | | | | | | | | | | | | | | | * grid-align layout macro and keymaps * physically align layout macro and keycodes Arrange the layout macro and keycodes to resemble the assembled keyboard. * update info.json data Updates the info.json data to be correct to the new layout macro.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-241-1/+1
|\|
| * expand the size of the textpad to allow for taller keyboards (#13319)Zach White2021-06-231-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-244-0/+279
|\|
| * [Keymap] gmmk/pro: willwm (#12952)Will Wolff-Myren2021-06-244-0/+279
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Create willwm keymap: Modified GMMK Pro Default + VIA + Space-Cadet Unicode * Temporarily remove unicode map calls; try using UNICODE_ENABLE instead * RGBLIGHT_ENABLE = yes * ...on second thought, don't enable RGBLIGHT =P * Move Del to PrtSc, add Home, move PrtSc to Fn+Home * willwm: Add keymap.json and readme.md * willwm: Add layer0/layer1 images * willwm: Update readme.md with info from PR #12952 * willwm: Update to better match template (https://docs.qmk.fm/#/documentation_templates)
* | kint36: set correct EEPROM size (#12946)Michael Stapelberg2021-06-241-0/+2
| | | | | | | | | | | | The Teensy 3.6 comes with 4096 bytes of EEPROM. This is commit 1 of 2 to make the EEPROM work. The next commit changes the core code to wire up the EEPROM.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-2431-0/+1799
|\|
| * Add the SquishyTKL and SquishyFRL (#12764)Ramon Imbao2021-06-2431-0/+1799
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add SquishyTKL * Add SquishyTKL-FRL * Adjust readme.md and info.json * Add JIS support for SquishyTKL * Fix JIS layout macro * Fix via layout and keymap * Migrate SquishyTKL to STM32duino bootloader * Make chibios conf files generic * Change TKL via keymap to match number of layers * Apply chibios changes to FRL as well * Adjust README regarding flashing with dfu-util * Add license and header guard
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-248-0/+349
|\|
| * Add "steal this keyboard" keybaord (#12898)obosob2021-06-248-0/+349
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-2420-0/+1131
|\|
| * Added Skeletn87 PCBs (#12922)kb-elmo2021-06-2420-0/+1131
| | | | | | | | | | | | | | | | | | | | | | * add Skeletn87 * update skeletn87 files * update skeletn87 soldered * update readme image * update readme (again)
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-249-0/+305
|\|
| * Latin6rgb use IS31FL3731 IC (#11819)184388802021-06-249-0/+305
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Create config.h * Add files via upload * Create keymap.c * Create keymap.c * Create rules.mk * Update readme.md * Update keyboards/latin6rgb/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/latin6rgb/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keymap.c * Update keymap.c * Update config.h * Update config.h Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-241-1/+1
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 02:53:54 +0000