aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-08-24Changes based on @fredizzimo review, flashing Infinity detailsGravatar Sean Reifschneider
2016-08-24Merge pull request #679 from algernon/h/ucis/subproject-fixGravatar Jack Humbert
quantum: Move qk_ucis_state to process_unicode.c
2016-08-24Merge pull request #646 from nclundsten/masterGravatar Jack Humbert
fix ergodox ez link
2016-08-24quantum: Move qk_ucis_state to process_unicode.cGravatar Gergely 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-24- Updated readme by adding link on kle for each layerGravatar dbroqua
2016-08-24Merge remote-tracking branch 'upstream/master' into makefile_overhaulGravatar Fred Sundvik
2016-08-24Fix slight inconsistencyGravatar Fred Sundvik
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.
2016-08-23NightlyGravatar IBNobody
Prep for Vision build
2016-08-23Merge remote-tracking branch 'refs/remotes/origin/master' into ↵Gravatar IBNobody
vision_division_dev
2016-08-23Merge remote-tracking branch 'refs/remotes/jackhumbert/master'Gravatar IBNobody
2016-08-23Fixed line endingGravatar IBNobody
2016-08-23Merge remote-tracking branch 'refs/remotes/jackhumbert/master'Gravatar IBNobody
2016-08-23Merge remote-tracking branch 'upstream/master'Gravatar dbroqua
2016-08-23Merge pull request #677 from SmackleFunky/masterGravatar Jack Humbert
Virtual Serial Port - and a Layout that uses that virtual serial port for Plover
2016-08-23Merge remote-tracking branch 'upstream/master'Gravatar dbroqua
# Conflicts: # keyboards/planck/keymaps/dbroqua/keymap.c
2016-08-23added my personal keymapGravatar René Werner
I ported my keymap from tmk to QMK.
2016-08-23Merge branch 'kitten_paw'Gravatar René Werner
2016-08-23Fixed wrong keycode in default keymapGravatar René Werner
Where I used KC_MENU I should have used KC_APP instead.
2016-08-23move to ergodox-ez onlyGravatar Jason Green
2016-08-23Split kitten_paw into Makefile/rules.mkGravatar Fred Sundvik
2016-08-23Merge branch 'master' into makefile_overhaulGravatar Fred Sundvik
2016-08-23Remove unneeded includeGravatar Jason Green
2016-08-23add missing #includeGravatar Jason Green
2016-08-23Merge pull request #671 from Talljoe/one-handGravatar Jack Humbert
Add native one-handed support
2016-08-23Merge pull request #673 from coderkun/masterGravatar Jack Humbert
Add method to set Unicode input key for ISO 14755
2016-08-23Merge pull request #675 from Xyverz/masterGravatar Jack Humbert
Added missing item K3A to KEYMAP() variable in tv44.h
2016-08-23Merge pull request #676 from ickerwx/kitten_pawGravatar Jack Humbert
Added support for the Kitten Paw controller
2016-08-23TxBolt (Steno) Serial protocol for Ergodox EzGravatar Jason Green
2016-08-23Added USB Virtual Serial supportGravatar Jason Green
2016-08-22- Added PrintScreen key on multimedia layerGravatar dbroqua
2016-08-22Added support for the Kitten Paw controllerGravatar René 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-22Changes from review by @fredizzimo and @XyverzGravatar Sean Reifschneider
2016-08-21NightlyGravatar IBNobody
Only major change to qmk was the addition of A0-A7 pins for the AT90USB
2016-08-21Merge remote-tracking branch 'upstream/master'Gravatar Xyverz
2016-08-21Added missing key K3A to KEYMAP() macro in tv44.hGravatar Xyverz
2016-08-21Merge pull request #669 from fredizzimo/windows10_build_instructionsGravatar Jack Humbert
Add instructions for Windows 10 subsystem for Linux
2016-08-21Merge pull request #668 from fredizzimo/line_endingsGravatar Jack Humbert
Enforce correct line endings
2016-08-21Merge pull request #674 from kyleberry/masterGravatar Jack Humbert
Fixing Dvorak
2016-08-21- Inverted key Tab and EscGravatar dbroqua
- Reorganised bottom row
2016-08-21Fixing DvorakGravatar Kyle Berry
Updating with proper Dvorak layout.
2016-08-21Drop method to set Unicode input key and declare start and finish methods as ↵Gravatar coderkun
“weak” instead
2016-08-21Add method to set Unicode input key for ISO 14755Gravatar coderkun
https://github.com/jackhumbert/qmk_firmware/issues/672
2016-08-21Change order of variable assignmentGravatar Fred Sundvik
BUILD_DIR and TARGET was assigned too late, so the dfu-util target, which depends on them did not work.
2016-08-21Add longest match to the rule-checkingGravatar Fred Sundvik
This fixes cases where you have several keyboards with a common prefix, like algernon, and algernon-master
2016-08-20Add one-hand key to planck/experimental keymap.Gravatar Joe Wasson
2016-08-20Add default swap configs for a couple of boards.Gravatar Joe Wasson
2016-08-20Improve one-hand support by adding more actions and tap keys.Gravatar Joe Wasson
2016-08-20Add one-hand support.Gravatar 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-20In Progress MergeGravatar IBNobody
2016-08-20Add warning about line endingsGravatar Fred Sundvik