summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-08-24Fixed getting "stuck" in gaming layerJoshua T
2016-08-24Merge remote-tracking branch 'upstream/master'Joshua T
2016-08-24Several key placement fixes.Joshua T
* Switched Tab and Super on the default layout * Moved Shift on Extend to pinky * Moved Caps Lock to upper right corner * Moved gaming toggle to avoid blocking Escape
2016-08-24Merge pull request #679 from algernon/h/ucis/subproject-fixJack Humbert
quantum: Move qk_ucis_state to process_unicode.c
2016-08-24Merge pull request #646 from nclundsten/masterJack Humbert
fix ergodox ez link
2016-08-24quantum: Move qk_ucis_state to process_unicode.cGergely Nagy
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>
2016-08-23Merge pull request #677 from SmackleFunky/masterJack Humbert
Virtual Serial Port - and a Layout that uses that virtual serial port for Plover
2016-08-23move to ergodox-ez onlyJason Green
2016-08-23Remove unneeded includeJason Green
2016-08-23add missing #includeJason Green
2016-08-23Merge pull request #671 from Talljoe/one-handJack Humbert
Add native one-handed support
2016-08-23Merge pull request #673 from coderkun/masterJack Humbert
Add method to set Unicode input key for ISO 14755
2016-08-23Merge pull request #675 from Xyverz/masterJack Humbert
Added missing item K3A to KEYMAP() variable in tv44.h
2016-08-23Merge pull request #676 from ickerwx/kitten_pawJack Humbert
Added support for the Kitten Paw controller
2016-08-23TxBolt (Steno) Serial protocol for Ergodox EzJason Green
2016-08-23Added USB Virtual Serial supportJason Green
2016-08-22Added support for the Kitten Paw controllerRené Werner
This adds support for the 2016 revision of the Kitten Paw [1] replacement controller by Bathroom Epiphanies. [1] http://bathroomepiphanies.com/controllers/
2016-08-21Merge remote-tracking branch 'upstream/master'Xyverz
2016-08-21Added missing key K3A to KEYMAP() macro in tv44.hXyverz
2016-08-21Merge pull request #669 from fredizzimo/windows10_build_instructionsJack Humbert
Add instructions for Windows 10 subsystem for Linux
2016-08-21Merge pull request #668 from fredizzimo/line_endingsJack Humbert
Enforce correct line endings
2016-08-21Merge pull request #674 from kyleberry/masterJack Humbert
Fixing Dvorak
2016-08-21Fixing DvorakKyle Berry
Updating with proper Dvorak layout.
2016-08-21Drop method to set Unicode input key and declare start and finish methods as ↵coderkun
“weak” instead
2016-08-21Add method to set Unicode input key for ISO 14755coderkun
https://github.com/jackhumbert/qmk_firmware/issues/672
2016-08-20Add one-hand key to planck/experimental keymap.Joe Wasson
2016-08-20Add default swap configs for a couple of boards.Joe Wasson
2016-08-20Improve one-hand support by adding more actions and tap keys.Joe Wasson
2016-08-20Add one-hand support.Joe Wasson
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.
2016-08-20Add warning about line endingsFred Sundvik
2016-08-20Add instructions for Windows 10 subsystem for LinuxFred Sundvik
Also simplify the linux instructions
2016-08-20Merge pull request #665 from linsomniac/keymap_jafoJack Humbert
Adding jafo layout.
2016-08-20Merge pull request #658 from Xyverz/masterJack Humbert
Got rid of all the kludge in my ErgoDox keymap.
2016-08-20Merge pull request #630 from nrrkeene/masterJack Humbert
The Ordinary Layout is the unsurprising layout
2016-08-20Normalize line endingsFred Sundvik
2016-08-20Add .gitattributes to ensure correct line endingsFred Sundvik
It also ensures that make files and shell script are checked out with lf endings, for compability with the Windows 10 bash
2016-08-19Merge remote-tracking branch 'upstream/master'Xyverz
2016-08-19Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md.Xyverz
2016-08-19Changed my keymap to match normal keymaps.Xyverz
2016-08-19The Ordinary Layout is boring because all the keys are where you expect them ↵Nicholas Keene
to be
2016-08-19The Ordinary Layout is boring because all the keys are where you expect them ↵Nicholas Keene
to be
2016-08-19Bringing over changes from default map.Sean Reifschneider
2016-08-19Merge pull request #662 from toneman77/iso_satanJack Humbert
Satan Cleanup
2016-08-19Merge pull request #663 from tomb0y/kc60_workman_deadJack Humbert
Add the workman-dead layout for kc60
2016-08-19Adding jafo layout.Sean Reifschneider
2016-08-19Add the workman-dead layout for kc60zs
2016-08-19Merge pull request #660 from toneman77/amj60Jack Humbert
new keyboard: AMJ60
2016-08-19forgot media keysToni
2016-08-19Merge remote-tracking branch 'origin/master' into amj60Toni
merge with upstream
2016-08-18Added compatibility for the Infinity ErgoDox to my Ergodox keymap.Xyverz
Updated readme.md to reflect this change.