summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-16[Keymap] added media controls, copy and paste; moved print screen (#14850)Roger
2021-10-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-16[Keyboard] Add SpiderIsland 25 key keyboard (#14793)​Andrzej Ressel
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-16[Keyboard] Update Support for The Uni (#14569)Peter Park
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Peter Park <peter@Peters-MacBook-Air.local>
2021-10-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-16Try to clarify "number of elements in info.json does not match" error (#14844)Ryan
2021-10-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-16[Keyboard] Fix minor typo in Ploopy Trackball Nano Docs (#14717)tangowithfoxtrot
2021-10-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-16add docs/ja/ja_doc_status.sh (#14402)Takeshi ISHII
2021-10-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-15[Keyboard] Amended Some Pins - KiwiKeebs Macro V2 (#14824)AKiwi92
Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ash <ash@splitpixel.co.uk>
2021-10-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-15[Keyboard] Adding CK60 and CK65 (#14737)hadi
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-15[Keymap] Update Miryoku (#14827)Manna Harbour
2021-10-15Merge remote-tracking branch 'origin/master' into developDrashna Jael're
2021-10-15[Keymap] Drashna Keymap Updates (#14842)Drashna Jaelre
* Fix issues with user split transport code * Improve OLED (More font stuff, improved keylogger, etc) * Add `KEYLOCK` macro to disable USB, borrowed from command feature. * Convert Kyria fully to proton C (no more AVR kyria) * Add Work Louder Work Board keymap
2021-10-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-15[Keyboard] Tractyl Manuform Updates (#14841)Drashna Jaelre
2021-10-15Merge remote-tracking branch 'origin/master' into developDrashna Jael're
2021-10-15[Keymap] Added GMMK Pro keymap with RGB (#14648)BenSchaeff
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-15[Keymap] zigotica userspace (#14670)Sergi Meseguer
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-15[Keyboard] add Pluckey (#14672)floookay
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-15[Keymap] Userspace updates (#14832)stanrc85
2021-10-16Further tidy up of STM32 eeprom emulation (#14591)Joel Challis
2021-10-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-16Update documentation because GPIO functions are no longer in quantum.h (#14826)Aaron Paterson
* GPIO functions are no longer in quantum.h * Update docs/internals_gpio_control.md Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-15Enable CLI flashing via mdloader (#14729)Joel Challis
* Enable CLI flashing via mdloader * remove flag * Update qmk flash help
2021-10-14Merge remote-tracking branch 'origin/master' into developDrashna Jael're
2021-10-14[Keyboard] Add MK61-RGB-ANSI keyboard (#14795)Felix Jen
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-15[Docs] Clean up reference_info_json.md (#14806)Ryan
2021-10-14[Keymap] Add keebio iris layout beakl 15 (#14762)Tom
2021-10-15remove Bracket Pair Colorizer recommendation (#14816)Alex Meyer
As of v1.60, vscode has a much faster built-in method of colorizing bracket pairs, making the extension unnecessary. https://code.visualstudio.com/blogs/2021/09/29/bracket-pair-colorization
2021-10-14[Keyboard] PLX Refactor (#14809)James Young
2021-10-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-14[Keyboard] Add ginkgo65 (#14802)rhmokey
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-14Documentation: Updated KBDFans readmes (#14725)MechMerlin
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-14[Keymap] Display default layer name (#14819)Reibl János Dániel
2021-10-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-14Add KC_BSLS key to Horizon keyboard default layout (#14815)Steven Karrmann
* Define Horizon keyboard * Set indentation according to QMK coding convention * Update horizon keyboard readme to satisfy current QMK template * Use row-column order in horizon readme * Update keyboards/horizon/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/horizon/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/horizon/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/horizon/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/horizon/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/horizon/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/horizon/info.json Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/horizon/info.json Co-authored-by: Ryan <fauxpark@gmail.com> * Add KC_BSLS to Horizon default keymap Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-14contra, fractal: Remove wrongly copypasted pin E6 manipulation code (#14818)Sergey Vlasov
Apparently the default keymaps for `contra` and `fractal` were derived from some `planck` keymap which contained code to control the status LED in the implementation of the `BACKLIT` custom keycode. Unfortunately, the code to control the LED manipulated the `E6` pin directly, and it was copied without changes, but the `contra` and `fractal` boards use the `E6` pin in the matrix, therefore pressing the key mapped to `BACKLIT` resulted in phantom keypresses for all keys in the corresponding column.
2021-10-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-13maxr1998/pulse4k: use layout macros in keymaps (#14808)James Young