summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-08-22Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne
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-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.
2016-08-18Merge pull request #655 from Dbroqua/patch-1Jack Humbert
Added dbroqua layout for planck keyboard
2016-08-18Merge pull request #656 from Vifon/dynamic_macrosJack Humbert
Improve the dynamic macro documentation
2016-08-19Improve the dynamic macro documentationWojciech Siewierski
2016-08-18Added dbroqua layout for planck keyboardDamien
2016-08-18Merge pull request #652 from iFreilicht/masterJack Humbert
Added S60-X keyboard
2016-08-18Merge pull request #651 from algernon/f/register16Jack Humbert
Add a register/unregister_code16 pair of functions
2016-08-18Merge pull request #650 from Xyverz/masterJack Humbert
Minor changes to keymaps and other files
2016-08-18Merge pull request #654 from algernon/h/planck-circuit-tap-dance-fixJack Humbert
planck/circuit: Update after the latest tap-dance change
2016-08-18made a correct default KEYMAP. moved the old one to KEYMAP_ANSIToni
fixed all layouts that were referencing KEYMAP to KEYMAP_ANSI whitespace prettyfying
2016-08-18smyll typo fixedToni
2016-08-18amj60 variant of the readmeToni
2016-08-18first attempt at documentation for the amj60 boardToni
2016-08-18planck/circuit: Update after the latest tap-dance changeGergely Nagy
Fixes #653. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-18uniform whitespaceToni
2016-08-18initial commit for the AMJ60 PCBToni
2016-08-18Added info to docsFelix Uhl
2016-08-18Merge pull request #1 from jackhumbert/masterFelix Uhl
Merging from base Repo
2016-08-18BugfixesFelix Uhl
2016-08-18Final link fixFelix Uhl
2016-08-18More link fixingFelix Uhl
2016-08-18Fixed links againFelix Uhl
Note to self: check before commiting.
2016-08-18Fixed dead linkFelix Uhl
2016-08-18Minor documentation changesFelix Uhl
2016-08-18Add a register/unregister_code16 pair of functionsGergely Nagy
These functions register not only the 8bit keycode, but the modifiers too. It doesn't handle the full range of the upper 8bits, just the mods, but that's a good start. Changed the tap-dance pair functions to use these, so one can do: `ACTION_TAP_DANCE_DOUBLE (KC_COLN, KC_SCLN)` ...and that will do the right thing. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>