summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #660 from toneman77/amj60Jack Humbert2016-08-1910-0/+650
|\ | | | | new keyboard: AMJ60
| * forgot media keysToni2016-08-191-1/+1
| |
| * Merge remote-tracking branch 'origin/master' into amj60Toni2016-08-1952-95/+5750
| |\ | |/ |/| | | merge with upstream
* | Merge pull request #655 from Dbroqua/patch-1Jack Humbert2016-08-181-0/+314
|\ \ | | | | | | Added dbroqua layout for planck keyboard
| * | Added dbroqua layout for planck keyboardDamien2016-08-181-0/+314
| | |
* | | Merge pull request #656 from Vifon/dynamic_macrosJack Humbert2016-08-181-2/+6
|\ \ \ | |/ / |/| | Improve the dynamic macro documentation
| * | Improve the dynamic macro documentationWojciech Siewierski2016-08-191-2/+6
|/ /
* | Merge pull request #652 from iFreilicht/masterJack Humbert2016-08-1841-0/+5228
|\ \ | | | | | | Added S60-X keyboard
| * | Added info to docsFelix Uhl2016-08-181-1/+1
| | |
| * | Merge pull request #1 from jackhumbert/masterFelix Uhl2016-08-18115-1531/+6981
| |\ \ | | | | | | | | Merging from base Repo
| * | | BugfixesFelix Uhl2016-08-181-6/+7
| | | |
| * | | Final link fixFelix Uhl2016-08-181-2/+2
| | | |
| * | | More link fixingFelix Uhl2016-08-181-6/+6
| | | |
| * | | Fixed links againFelix Uhl2016-08-181-2/+2
| | | | | | | | | | | | Note to self: check before commiting.
| * | | Fixed dead linkFelix Uhl2016-08-181-1/+1
| | | |
| * | | Minor documentation changesFelix Uhl2016-08-182-28/+21
| | | |
| * | | Fixed links againFelix Uhl2016-08-181-3/+5
| | | |
| * | | Fixed pictures and linksFelix Uhl2016-08-181-15/+13
| | | |
| * | | Documentation overhaul.Felix Uhl2016-08-1810-9/+3138
| | | |
| * | | Small changes, renamed keymapFelix Uhl2016-08-184-213/+236
| | | | | | | | | | | | | | | | | | | | | | | | Added MicMute Revived all dead keys Removed OS Shift
| * | | Minor changes to felix keymapFelix Uhl2016-08-153-17/+54
| | | |
| * | | Ported all keymapsFelix Uhl2016-08-1414-92/+115
| | | | | | | | | | | | | | | | | | | | | | | | Old TMK keymaps were ported and confirmed to compile All keymaps compiled and added to zip-archive. Documentation was updated.
| * | | Update readme.mdFelix Uhl2016-08-141-1/+1
| | | |
| * | | Fixed links to keymap sourcesFelix Uhl2016-08-141-14/+13
| | | |
| * | | Added all original S60-X keymapsFelix Uhl2016-08-1428-150/+1579
| | | | | | | | | | | | | | | | | | | | | | | | | | | | All keymaps that were included in VinnyCordeiro's repository were ported to QMK. Main Readme was copied over from VC's repo, slightly altered. Main Makefile was updated to reflect VC's original configuration. Small changes in felix keymap.
| * | | Small changesFelix Uhl2016-08-112-9/+10
| | | | | | | | | | | | | | | | | | | | Enabled Bootmagic and ISO layouts on felix keymap Added unused pins
| * | | Minor changes to keymapsFelix Uhl2016-08-113-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | Clarified extra keys Made ISO-keys non-dead in default layout Added non-US backslash on felix layout
| * | | Added S60-X to keyboards with two layouts.Felix Uhl2016-08-1112-0/+590
| | | |
* | | | Merge pull request #651 from algernon/f/register16Jack Humbert2016-08-183-4/+44
|\ \ \ \ | | | | | | | | | | Add a register/unregister_code16 pair of functions
| * | | | Add a register/unregister_code16 pair of functionsGergely Nagy2016-08-183-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>
* | | | Merge pull request #650 from Xyverz/masterJack Humbert2016-08-185-88/+157
|\ \ \ \ | | | | | | | | | | Minor changes to keymaps and other files
| * | | | One last change to the readme.Xyverz2016-08-181-3/+1
| | | | |
| * | | | One last formatting changeXyverz2016-08-181-1/+1
| | | | |
| * | | | more formatting changesXyverz2016-08-181-90/+90
| | | | |
| * | | | Hopefully this fixes the layout diagrams.Xyverz2016-08-181-91/+91
| | | | |
| * | | | Added a readme, tidied up comments in the keymap.Xyverz2016-08-182-29/+147
| | | | |
| * | | | Returned RAISE and LOWER buttons to their original functions - too many ↵Xyverz2016-08-181-3/+3
| | | | | | | | | | | | | | | | | | | | inopportune ENTER inputs. :-(
| * | | | Merge branch 'master' of https://github.com/Xyverz/qmk_firmwareXyverz2016-08-171-0/+5
| |\ \ \ \
| | * | | | Update readme.mdXyverz2016-08-171-1/+1
| | | | | |
| | * | | | Create readme.mdXyverz2016-08-171-0/+5
| | | | | |
| * | | | | Merge remote-tracking branch 'upstream/master'Xyverz2016-08-1727-108/+1615
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / this merge is necessary,
| * | | | Adding KC_BSPC to the LT() macro for LOWER resulted in a backspace stroke ↵Xyverz2016-08-152-59/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | being sent if the LOWER key was used too quickly. Switching back to original LOWER macro, but keeping the new RAISE macro.
| * | | | Adding u/treasuredfrog's hack to use LT() with the RAISE and LOWER macros.Xyverz2016-08-151-6/+6
| | | | |
| * | | | Merge remote-tracking branch 'upstream/master'Xyverz2016-08-1422-1/+687
| |\ \ \ \
| * | | | | Setup the bottom-row modifiers to be mac-like in their arrangement.Xyverz2016-08-141-3/+3
| | | | | |
* | | | | | Merge pull request #654 from algernon/h/planck-circuit-tap-dance-fixJack Humbert2016-08-181-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | planck/circuit: Update after the latest tap-dance change
| * | | | | planck/circuit: Update after the latest tap-dance changeGergely Nagy2016-08-181-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #653. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
| | | | * smyll typo fixedToni2016-08-181-1/+1
| | | | |
| | | | * amj60 variant of the readmeToni2016-08-181-0/+30
| | | | |
| | | | * first attempt at documentation for the amj60 boardToni2016-08-181-0/+57
| | | | |