summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-08-19Merge https://github.com/IBNobody/qmk_firmwareIBNobody
2016-08-19fixed color detection routine in makefileIBNobody
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-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-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>
2016-08-18Fixed links againFelix Uhl
2016-08-18Fixed pictures and linksFelix Uhl
2016-08-18Documentation overhaul.Felix Uhl
2016-08-18cleanup, readability , shift swap in ISO_SPLIT_RSHIFTToni
2016-08-18Small changes, renamed keymapFelix Uhl
Added MicMute Revived all dead keys Removed OS Shift
2016-08-18corrected the split rshift key to realityToni
fixed my keymap in the process to adjust to that
2016-08-18One last change to the readme.Xyverz
2016-08-18One last formatting changeXyverz
2016-08-18more formatting changesXyverz
2016-08-18Hopefully this fixes the layout diagrams.Xyverz
2016-08-18Added a readme, tidied up comments in the keymap.Xyverz
2016-08-18Returned RAISE and LOWER buttons to their original functions - too many ↵Xyverz
inopportune ENTER inputs. :-(
2016-08-17Merge branch 'master' of https://github.com/Xyverz/qmk_firmwareXyverz
2016-08-17Merge remote-tracking branch 'upstream/master'Xyverz
this merge is necessary,
2016-08-17Merge pull request #648 from Vifon/dynamic_macrosJack Humbert
Implement the dynamic macros that are recorded in runtime
2016-08-17Merge pull request #647 from Vifon/process_record_nocache-fixJack Humbert
Fix the process_record_nocache function
2016-08-17Merge pull request #645 from algernon/f/tap-dance/bufferingJack Humbert
tap-dance rework
2016-08-17Merge pull request #640 from toneman77/iso_satanJack Humbert
heavily modified spacefn layout for iso boards using the satan PCB