summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [develop] Fix pimoroni trackball read address (#13810)Dasky2021-07-311-1/+1
|
* Update LUFA Submodule (2021-07-30) (#13819)Drashna Jaelre2021-07-311-0/+0
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-311-364/+85
|\
| * Neito: correct key sequence in info.json (#13808)James Young2021-07-311-364/+85
| |
* | [CLI] Make `qmk doctor` more lenient about system config (#13804)ruro2021-07-302-6/+12
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-312-6/+6
|\|
| * Fix up paths for bioi boards - parallel compilation failures due to file ↵Nick Brassel2021-07-312-6/+6
| | | | | | | | collisions. (#13806)
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-301-0/+1
|\|
| * Explicitly state that VIA should not be enabled in the default keymap. (#13803)Nick Brassel2021-07-311-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-302-0/+0
|\|
| * Move ergosaurus via keymap to correct location (#13802)Joel Challis2021-07-312-0/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-301-1/+1
|\|
| * Fix onekey console keymap (#13797)Ryan2021-07-301-1/+1
| |
* | Port new_keyboard.sh to CLI (#13706)Ryan2021-07-307-61/+213
| | | | | | Co-authored-by: Erovia <Erovia@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-301-0/+99
|\|
| * Xelus Dharma: add info.json file (#13796)James Young2021-07-301-0/+99
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-303-4/+7
|\|
| * txuu: rename LAYOUT to LAYOUT_65_ansi_blocker_split_bs (#13794)James Young2021-07-302-3/+6
| | | | | | Renames the layout macro to be more conformant to the rest of QMK.
| * Tiger910: fix Left Control key size in info.json (#13793)James Young2021-07-301-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-301-1/+1
|\|
| * Stratos: fix layout macro reference in info.json (#13792)James Young2021-07-301-1/+1
| | | | | | - change LAYOUT_60_ansi_tsangan_hhkb to LAYOUT_60_tsangan_hhkb
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-305-14/+65
|\|
| * Ristretto: fix Configurator layout data (#13791)James Young2021-07-301-6/+54
| |
| * X-Bows Ranger: rename LAYOUT to LAYOUT_tkl_ansi (#13795)James Young2021-07-304-8/+11
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-3051-118/+121
|\|
| * Onekey cleanup (#13786)Ryan2021-07-3051-118/+121
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-3010-0/+649
|\|
| * [Keyboard] Add portal 66 (#13767)Matthew Dias2021-07-3010-0/+649
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-307-0/+235
|\|
| * [Keyboard] Add Commodore Amiga 1200 Membrane Converter (#13705)8bits4ever2021-07-307-0/+235
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-301-1/+1
|\|
| * Pearl Boards Pandora: correct layout macro reference in info.json (#13787)James Young2021-07-301-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-304-10/+10
|\|
| * Ocean Sus Board: rename layout macro (#13785)James Young2021-07-304-10/+10
| | | | | | | | - rename LAYOUT_ortho_3x4 to LAYOUT_ortho_4x3 - ... because ortho layouts in QMK are named by <rows>x<columns> instead of <columns>x<rows>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-302-3/+62
|\|
| * Nack: rename layout macro to LAYOUT_ortho_4x13 (#13784)James Young2021-07-302-3/+62
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-302-2/+8
|\|
| * `qmk docs`: Add flag to open in browser (#13788)Ryan2021-07-302-2/+8
| | | | | | | | | | * `qmk docs`: Add flag to open in browser * Add docs
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-301-1/+89
|\|
| * MNK1800s: fix Configurator key sequence (#13783)James Young2021-07-301-1/+89
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-301-0/+0
|\|
| * Clawsome Luggage Rack: correct keymap directory name (#13780)James Young2021-07-301-0/+0
| | | | | | Rename `keyboards/clawsome/luggage_rack/keymap/` to `keyboards/clawsome/luggage_rack/keymaps/`.
* | Merge remote-tracking branch 'upstream/master' into developJames Young2021-07-2978-732/+2857
|\|
| * [Docs] Added information on soldering diodes in parallel (#13117)officereso2021-07-291-1/+1
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Initial Noxary 378 support (#13156)Álvaro A. Volpato2021-07-2910-0/+295
| | | | | | Co-authored-by: Gondolindrim <alvaro.augusto.volpato@gmail.com>
| * [Keymap] jonavin gmmk pro keymap add RGB functionality (#13591)Jonavin2021-07-294-34/+356
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Jonavin <=>
| * CherryB Studio CB1800: fix key sequence in info.json (#13779)James Young2021-07-291-2/+118
| | | | | | This commit fixes the position in sequence of the arrow keys.
| * [Keymap] jonavin quefrency keymap (#13751)Jonavin2021-07-293-19/+114
| | | | | | | | add winkeylock and rgb functions Co-authored-by: Jonavin <=>
| * Cannonkeys Balance: Configurator fixes (#13778)James Young2021-07-291-1/+95
| |
| * [Keyboard] Added YMD40v2 VIA (#13770)Trent Hoh2021-07-293-0/+47
| | | | | | VIA support for YMD40v2