summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Merge pull request #682 from jeebak/jd45-jeebakJack Humbert2016-08-253-0/+568
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port jeebak's Planck keymap to JD45
| | * | | | | | | | | | | | | Make the "extra" key in the top row another backspaceJeeBak Kim2016-08-251-10/+10
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | [jd45] Port jeebak's planck keymap to jd45JeeBak Kim2016-08-243-9/+560
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | [jd45] Add "jeebak" keymap folder as a copy of the "default" folderJeeBak Kim2016-08-241-0/+17
| | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #680 from replicaJunction/layout-atreus-replicaJunctionJack Humbert2016-08-258-0/+258
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | Added replicaJunction keymap
| | * | | | | | | | | | | | Added replicaJunction keymapJoshua T2016-08-248-0/+258
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | 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 remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik2016-08-249-4/+695
|\| | | | | | | | | | | |
| * | | | | | | | | | | | 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
| | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
* | | | | | | | | | | | Fix slight inconsistencyFred Sundvik2016-08-241-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running make from either a keyboard folder or a subproject it runs all keymaps for all subprojects and the selected subproject respectively. Without this fix, the same doesn't happen if your run make clean for example. As it would just provide you with an error message. Now this will work as expected.
* | | | | | | | | | | | Split kitten_paw into Makefile/rules.mkFred Sundvik2016-08-232-75/+73
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' into makefile_overhaulFred Sundvik2016-08-2367-2662/+3797
|\| | | | | | | | | | |
| * | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | | </