summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Joshua T2016-08-24219-3936/+16346
|\
| * Merge pull request #679 from algernon/h/ucis/subproject-fixJack Humbert2016-08-242-2/+6
| |\ | | | | | | quantum: Move qk_ucis_state to process_unicode.c
| | * quantum: Move qk_ucis_state to process_unicode.cGergely Nagy2016-08-242-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to not declare the same variable in multiple objects (which happens when building UCIS-enabled keymap for both the ErgoDox EZ and the ErgoDox Infinity), move the declaration to the .c file, and keep only an extern reference in the header. Many thanks to @fredizzimo for spotting the error in Travis, and suggesting the fix. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
| * | Merge pull request #646 from nclundsten/masterJack Humbert2016-08-241-1/+1
| |\ \ | | |/ | |/| fix ergodox ez link
| | * trailing slashNigel Lundsten2016-08-171-1/+1
| | |
| | * fix ergodox link (again?) Nigel Lundsten2016-08-171-1/+1
| | | | | | | | | /ergodox/ez is a broken link, seems like the ez stuff is at /ergodox
| * | Merge pull request #677 from SmackleFunky/masterJack Humbert2016-08-239-4/+695
| |\ \ | | | | | | | | Virtual Serial Port - and a Layout that uses that virtual serial port for Plover
| | * | move to ergodox-ez onlyJason Green2016-08-234-1/+1
| | | |
| | * | Remove unneeded includeJason Green2016-08-231-1/+0
| | | |
| | * | add missing #includeJason Green2016-08-231-0/+1
| | | |
| | * | TxBolt (Steno) Serial protocol for Ergodox EzJason Green2016-08-233-0/+419
| | | |
| | * | Added USB Virtual Serial supportJason Green2016-08-236-4/+276
| | | |
| * | | Merge pull request #671 from Talljoe/one-handJack Humbert2016-08-2310-5/+210
| |\ \ \ | | | | | | | | | | Add native one-handed support
| | * | | Add one-hand key to planck/experimental keymap.Joe Wasson2016-08-202-4/+5
| | | | |
| | * | | Add default swap configs for a couple of boards.Joe Wasson2016-08-203-0/+45
| | | | |
| | * | | Improve one-hand support by adding more actions and tap keys.Joe Wasson2016-08-203-9/+89
| | | | |
| | * | | Add one-hand support.Joe Wasson2016-08-205-1/+80
| | | | | | | | | | | | | | | | | | | | This adds an action, `ACTION_SWAP_HANDS`, that swaps the the keys on the keyboard across a keymap-defined hemisphere in order to support one-hand typing without requiring a separate one-handed layer. See updated `doc/keymap.md` for more information.
| * | | | Merge pull request #673 from coderkun/masterJack Humbert2016-08-231-0/+2
| |\ \ \ \ | | | | | | | | | | | | Add method to set Unicode input key for ISO 14755
| | * | | | Drop method to set Unicode input key and declare start and finish methods as ↵coderkun2016-08-212-13/+4
| | | | | | | | | | | | | | | | | | | | | | | | “weak” instead
| | * | | | Add method to set Unicode input key for ISO 14755coderkun2016-08-212-2/+13
| | |/ / / | | | | | | | | | | | | | | | https://github.com/jackhumbert/qmk_firmware/issues/672
| * | | | Merge pull request #675 from Xyverz/masterJack Humbert2016-08-231-1/+1
| |\ \ \ \ | | | | | | | | | | | | Added missing item K3A to KEYMAP() variable in tv44.h
| | * \ \ \ Merge remote-tracking branch 'upstream/master'Xyverz2016-08-2144-2447/+2762
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Added missing key K3A to KEYMAP() macro in tv44.hXyverz2016-08-211-1/+1
| | | | | |
| * | | | | Merge pull request #676 from ickerwx/kitten_pawJack Humbert2016-08-239-0/+611
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Added support for the Kitten Paw controller
| | * | | | Added support for the Kitten Paw controllerRené Werner2016-08-229-0/+611
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for the 2016 revision of the Kitten Paw [1] replacement controller by Bathroom Epiphanies. [1] http://bathroomepiphanies.com/controllers/
| * | | | Merge pull request #669 from fredizzimo/windows10_build_instructionsJack Humbert2016-08-211-2/+49
| |\ \ \ \ | | | | | | | | | | | | Add instructions for Windows 10 subsystem for Linux
| | * | | | Add warning about line endingsFred Sundvik2016-08-201-0/+2
| | | | | |
| | * | | | Add instructions for Windows 10 subsystem for LinuxFred Sundvik2016-08-201-2/+47
| | | | | | | | | | | | | | | | | | | | | | | | Also simplify the linux instructions
| * | | | | Merge pull request #668 from fredizzimo/line_endingsJack Humbert2016-08-2127-2169/+2262
| |\ \ \ \ \ | | | | | | | | | | | | | | Enforce correct line endings
| | * | | | | Normalize line endingsFred Sundvik2016-08-2026-2169/+2169
| | | | | | |
| | * | | | | Add .gitattributes to ensure correct line endingsFred Sundvik2016-08-201-0/+93
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | It also ensures that make files and shell script are checked out with lf endings, for compability with the Windows 10 bash
| * | | | | Merge pull request #674 from kyleberry/masterJack Humbert2016-08-211-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Fixing Dvorak
| | * | | | Fixing DvorakKyle Berry2016-08-211-1/+1
| |/ / / / | | | | | | | | | | | | | | | Updating with proper Dvorak layout.
| * | | | Merge pull request #665 from linsomniac/keymap_jafoJack Humbert2016-08-205-0/+213
| |\ \ \ \ | | | | | | | | | | | | Adding jafo layout.
| | * | | | Bringing over changes from default map.Sean Reifschneider2016-08-191-4/+3
| | | | | |
| | * | | | Adding jafo layout.Sean Reifschneider2016-08-195-0/+214
| | | | | |
| * | | | | Merge pull request #658 from Xyverz/masterJack Humbert2016-08-202-209/+211
| |\ \ \ \ \ | | | |_|/ / | | |/| | | Got rid of all the kludge in my ErgoDox keymap.
| | * | | | Merge remote-tracking branch 'upstream/master'Xyverz2016-08-1966-92/+6560
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md.Xyverz2016-08-192-17/+10
| | | | | |
| | * | | | Changed my keymap to match normal keymaps.Xyverz2016-08-191-314/+198
| | | | | |
| | * | | | Added compatibility for the Infinity ErgoDox to my Ergodox keymap.Xyverz2016-08-182-53/+178
| | | | | | | | | | | | | | | | | | | | | | | | Updated readme.md to reflect this change.
| * | | | | Merge pull request #630 from nrrkeene/masterJack Humbert2016-08-2010-275/+237
| |\ \ \ \ \ | | |_|/ / / | |/| | | | The Ordinary Layout is the unsurprising layout
| | * | | | The Ordinary Layout is boring because all the keys are where you expect them ↵Nicholas Keene2016-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | to be
| | * | | | The Ordinary Layout is boring because all the keys are where you expect them ↵Nicholas Keene2016-08-198-111/+98
| | | | | | | | | | | | | | | | | | | | | | | | to be
| | * | | | The Ordinary Layout is the unsurprising layoutNicholas Keene2016-08-1310-183/+158
| | | | | |
| * | | | | Merge pull request #662 from toneman77/iso_satanJack Humbert2016-08-196-85/+117
| |\ \ \ \ \ | | | | | | | | | | | | | | Satan Cleanup
| | * | | | | made a correct default KEYMAP. moved the old one to KEYMAP_ANSIToni2016-08-185-59/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed all layouts that were referencing KEYMAP to KEYMAP_ANSI whitespace prettyfying
| | * | | | | cleanup, readability , shift swap in ISO_SPLIT_RSHIFTToni2016-08-181-17/+20
| | | | | | |
| | * | | | | corrected the split rshift key to realityToni2016-08-182-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed my keymap in the process to adjust to that
| * | | | | | Merge pull request #663 from tomb0y/kc60_workman_deadJack Humbert2016-08-193-0/+200
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | Add the workman-dead layout for kc60
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 08:04:25 +0000