summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-08-23Merge remote-tracking branch 'upstream/master'dbroqua86-2749/+4770
# Conflicts: # keyboards/planck/keymaps/dbroqua/keymap.c
2016-08-23Merge pull request #671 from Talljoe/one-handJack Humbert10-5/+210
Add native one-handed support
2016-08-23Merge pull request #673 from coderkun/masterJack Humbert1-0/+2
Add method to set Unicode input key for ISO 14755
2016-08-23Merge pull request #675 from Xyverz/masterJack Humbert1-1/+1
Added missing item K3A to KEYMAP() variable in tv44.h
2016-08-23Merge pull request #676 from ickerwx/kitten_pawJack Humbert9-0/+611
Added support for the Kitten Paw controller
2016-08-22- Added PrintScreen key on multimedia layerdbroqua2-2/+2
2016-08-22Added support for the Kitten Paw controllerRené Werner9-0/+611
This adds support for the 2016 revision of the Kitten Paw [1] replacement controller by Bathroom Epiphanies. [1] http://bathroomepiphanies.com/controllers/
2016-08-22Merge remote-tracking branch 'upstream/master'Xyverz44-2447/+2762
2016-08-22Added missing key K3A to KEYMAP() macro in tv44.hXyverz1-1/+1
2016-08-22Merge pull request #669 from fredizzimo/windows10_build_instructionsJack Humbert1-2/+49
Add instructions for Windows 10 subsystem for Linux
2016-08-22Merge pull request #668 from fredizzimo/line_endingsJack Humbert27-2169/+2262
Enforce correct line endings
2016-08-22Merge pull request #674 from kyleberry/masterJack Humbert1-1/+1
Fixing Dvorak
2016-08-21- Inverted key Tab and Escdbroqua2-12/+12
- Reorganised bottom row
2016-08-21Fixing DvorakKyle Berry1-1/+1
Updating with proper Dvorak layout.
2016-08-21Drop method to set Unicode input key and declare start and finish methods as ↵coderkun2-13/+4
“weak” instead
2016-08-21Add method to set Unicode input key for ISO 14755coderkun2-2/+13
https://github.com/jackhumbert/qmk_firmware/issues/672
2016-08-21Add one-hand key to planck/experimental keymap.Joe Wasson2-4/+5
2016-08-21Add default swap configs for a couple of boards.Joe Wasson3-0/+45
2016-08-21Improve one-hand support by adding more actions and tap keys.Joe Wasson3-9/+89
2016-08-21Add one-hand support.Joe Wasson5-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.
2016-08-20Add warning about line endingsFred Sundvik1-0/+2
2016-08-20Add instructions for Windows 10 subsystem for LinuxFred Sundvik1-2/+47
Also simplify the linux instructions
2016-08-20Merge pull request #665 from linsomniac/keymap_jafoJack Humbert5-0/+213
Adding jafo layout.
2016-08-20Merge pull request #658 from Xyverz/masterJack Humbert2-209/+211
Got rid of all the kludge in my ErgoDox keymap.
2016-08-20Merge pull request #630 from nrrkeene/masterJack Humbert10-275/+237
The Ordinary Layout is the unsurprising layout
2016-08-20Normalize line endingsFred Sundvik26-2169/+2169
2016-08-20Add .gitattributes to ensure correct line endingsFred Sundvik1-0/+93
It also ensures that make files and shell script are checked out with lf endings, for compability with the Windows 10 bash
2016-08-20Merge remote-tracking branch 'upstream/master'Xyverz66-92/+6560
2016-08-20Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md.Xyverz2-17/+10
2016-08-20Changed my keymap to match normal keymaps.Xyverz1-314/+198
2016-08-20The Ordinary Layout is boring because all the keys are where you expect them ↵Nicholas Keene1-1/+1
to be
2016-08-20The Ordinary Layout is boring because all the keys are where you expect them ↵Nicholas Keene8-111/+98
to be
2016-08-20Bringing over changes from default map.Sean Reifschneider1-4/+3
2016-08-19Merge pull request #662 from toneman77/iso_satanJack Humbert6-85/+117
Satan Cleanup
2016-08-19Merge pull request #663 from tomb0y/kc60_workman_deadJack Humbert3-0/+200
Add the workman-dead layout for kc60
2016-08-19Adding jafo layout.Sean Reifschneider5-0/+214
2016-08-19Add the workman-dead layout for kc60zs3-0/+200
2016-08-19- Moved Insert/Del in Esc layerdbroqua3-7/+7
2016-08-19- Updated lower and raise layerdbroqua2-126/+46
2016-08-19Merge pull request #660 from toneman77/amj60Jack Humbert10-0/+650
new keyboard: AMJ60
2016-08-19- Added readme file and layout previewdbroqua2-0/+11
2016-08-19- Moved Home/End/PgUp/PgDn on arrow keysdbroqua1-9/+9
2016-08-19forgot media keysToni1-1/+1
2016-08-19Merge remote-tracking branch 'origin/master' into amj60Toni52-95/+5750
merge with upstream
2016-08-19- Moved Brite function on esc to avoid conflict with ctrl key.dbroqua1-4/+4
2016-08-19- Updated dbroqua layout for planck keyboarddbroqua1-0/+314
2016-08-19Added compatibility for the Infinity ErgoDox to my Ergodox keymap.Xyverz2-53/+178
Updated readme.md to reflect this change.
2016-08-19Merge pull request #655 from Dbroqua/patch-1Jack Humbert1-0/+314
Added dbroqua layout for planck keyboard
2016-08-19Merge pull request #656 from Vifon/dynamic_macrosJack Humbert1-2/+6
Improve the dynamic macro documentation
2016-08-19Improve the dynamic macro documentationWojciech Siewierski1-2/+6