summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-08-19Merge remote-tracking branch 'origin/master' into amj60Toni52-95/+5750
merge with upstream
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
2016-08-18Added dbroqua layout for planck keyboardDamien1-0/+314
2016-08-18Merge pull request #652 from iFreilicht/masterJack Humbert41-0/+5228
Added S60-X keyboard
2016-08-18Merge pull request #651 from algernon/f/register16Jack Humbert3-4/+44
Add a register/unregister_code16 pair of functions
2016-08-18Merge pull request #650 from Xyverz/masterJack Humbert5-88/+157
Minor changes to keymaps and other files
2016-08-18Merge pull request #654 from algernon/h/planck-circuit-tap-dance-fixJack Humbert1-1/+1
planck/circuit: Update after the latest tap-dance change
2016-08-18made a correct default KEYMAP. moved the old one to KEYMAP_ANSIToni5-59/+86
fixed all layouts that were referencing KEYMAP to KEYMAP_ANSI whitespace prettyfying
2016-08-18smyll typo fixedToni1-1/+1
2016-08-18amj60 variant of the readmeToni1-0/+30
2016-08-18first attempt at documentation for the amj60 boardToni1-0/+57
2016-08-18planck/circuit: Update after the latest tap-dance changeGergely Nagy1-1/+1
Fixes #653. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-18uniform whitespaceToni1-45/+45
2016-08-18initial commit for the AMJ60 PCBToni8-0/+563
2016-08-18Added info to docsFelix Uhl1-1/+1
2016-08-18Merge pull request #1 from jackhumbert/masterFelix Uhl115-1531/+6981
Merging from base Repo
2016-08-18BugfixesFelix Uhl1-6/+7
2016-08-18Final link fixFelix Uhl1-2/+2
2016-08-18More link fixingFelix Uhl1-6/+6
2016-08-18Fixed links againFelix Uhl1-2/+2
Note to self: check before commiting.
2016-08-18Fixed dead linkFelix Uhl1-1/+1
2016-08-18Minor documentation changesFelix Uhl2-28/+21
2016-08-18Add a register/unregister_code16 pair of functionsGergely Nagy3-4/+44
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 Uhl1-3/+5
2016-08-18Fixed pictures and linksFelix Uhl1-15/+13
2016-08-18Documentation overhaul.Felix Uhl10-9/+3138
2016-08-18cleanup, readability , shift swap in ISO_SPLIT_RSHIFTToni1-17/+20
2016-08-18Small changes, renamed keymapFelix Uhl4-213/+236
Added MicMute Revived all dead keys Removed OS Shift
2016-08-18corrected the split rshift key to realityToni2-9/+11
fixed my keymap in the process to adjust to that
2016-08-18One last change to the readme.Xyverz1-3/+1
2016-08-18One last formatting changeXyverz1-1/+1
2016-08-18more formatting changesXyverz1-90/+90
2016-08-18Hopefully this fixes the layout diagrams.Xyverz1-91/+91
2016-08-18Added a readme, tidied up comments in the keymap.Xyverz2-29/+147
2016-08-18Returned RAISE and LOWER buttons to their original functions - too many ↵Xyverz1-3/+3
inopportune ENTER inputs. :-(
2016-08-18Merge branch 'master' of https://github.com/Xyverz/qmk_firmwareXyverz1-0/+5
2016-08-18Merge remote-tracking branch 'upstream/master'Xyverz27-108/+1615
this merge is necessary,
2016-08-18Merge pull request #648 from Vifon/dynamic_macrosJack Humbert2-0/+269
Implement the dynamic macros that are recorded in runtime
2016-08-18Merge pull request #647 from Vifon/process_record_nocache-fixJack Humbert1-10/+12
Fix the process_record_nocache function
2016-08-18Merge pull request #645 from algernon/f/tap-dance/bufferingJack Humbert5-68/+71
tap-dance rework
2016-08-18Merge pull request #640 from toneman77/iso_satanJack Humbert9-0/+364
heavily modified spacefn layout for iso boards using the satan PCB
2016-08-18Merge pull request #638 from premek/masterJack Humbert3-0/+260
Split layout for planck
2016-08-18Merge pull request #637 from mld2443/masterJack Humbert5-0/+418
Circuit keymap for Planck keyboard
2016-08-18Add the dynamic macros documentation to the readmeWojciech Siewierski1-0/+43
2016-08-18Implement the dynamic macros that are recorded in runtimeWojciech Siewierski1-0/+226
2016-08-18Fix the process_record_nocache functionWojciech Siewierski1-10/+12
This function relies on checking the disable_action_cache static variable before accessing the layer cache.
2016-08-17Update readme.mdXyverz1-1/+1
2016-08-17Create readme.mdXyverz1-0/+5