Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #660 from toneman77/amj60 | Jack Humbert | 2016-08-19 | 10 | -0/+650 |
|\ | | | | | new keyboard: AMJ60 | ||||
| * | forgot media keys | Toni | 2016-08-19 | 1 | -1/+1 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into amj60 | Toni | 2016-08-19 | 52 | -95/+5750 |
| |\ | |/ |/| | | | merge with upstream | ||||
* | | Merge pull request #655 from Dbroqua/patch-1 | Jack Humbert | 2016-08-18 | 1 | -0/+314 |
|\ \ | | | | | | | Added dbroqua layout for planck keyboard | ||||
| * | | Added dbroqua layout for planck keyboard | Damien | 2016-08-18 | 1 | -0/+314 |
| | | | |||||
* | | | Merge pull request #656 from Vifon/dynamic_macros | Jack Humbert | 2016-08-18 | 1 | -2/+6 |
|\ \ \ | |/ / |/| | | Improve the dynamic macro documentation | ||||
| * | | Improve the dynamic macro documentation | Wojciech Siewierski | 2016-08-19 | 1 | -2/+6 |
|/ / | |||||
* | | Merge pull request #652 from iFreilicht/master | Jack Humbert | 2016-08-18 | 41 | -0/+5228 |
|\ \ | | | | | | | Added S60-X keyboard | ||||
| * | | Added info to docs | Felix Uhl | 2016-08-18 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #1 from jackhumbert/master | Felix Uhl | 2016-08-18 | 115 | -1531/+6981 |
| |\ \ | | | | | | | | | Merging from base Repo | ||||
| * | | | Bugfixes | Felix Uhl | 2016-08-18 | 1 | -6/+7 |
| | | | | |||||
| * | | | Final link fix | Felix Uhl | 2016-08-18 | 1 | -2/+2 |
| | | | | |||||
| * | | | More link fixing | Felix Uhl | 2016-08-18 | 1 | -6/+6 |
| | | | | |||||
| * | | | Fixed links again | Felix Uhl | 2016-08-18 | 1 | -2/+2 |
| | | | | | | | | | | | | Note to self: check before commiting. | ||||
| * | | | Fixed dead link | Felix Uhl | 2016-08-18 | 1 | -1/+1 |
| | | | | |||||
| * | | | Minor documentation changes | Felix Uhl | 2016-08-18 | 2 | -28/+21 |
| | | | | |||||
| * | | | Fixed links again | Felix Uhl | 2016-08-18 | 1 | -3/+5 |
| | | | | |||||
| * | | | Fixed pictures and links | Felix Uhl | 2016-08-18 | 1 | -15/+13 |
| | | | | |||||
| * | | | Documentation overhaul. | Felix Uhl | 2016-08-18 | 10 | -9/+3138 |
| | | | | |||||
| * | | | Small changes, renamed keymap | Felix Uhl | 2016-08-18 | 4 | -213/+236 |
| | | | | | | | | | | | | | | | | | | | | | | | | Added MicMute Revived all dead keys Removed OS Shift | ||||
| * | | | Minor changes to felix keymap | Felix Uhl | 2016-08-15 | 3 | -17/+54 |
| | | | | |||||
| * | | | Ported all keymaps | Felix Uhl | 2016-08-14 | 14 | -92/+115 |
| | | | | | | | | | | | | | | | | | | | | | | | | Old TMK keymaps were ported and confirmed to compile All keymaps compiled and added to zip-archive. Documentation was updated. | ||||
| * | | | Update readme.md | Felix Uhl | 2016-08-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed links to keymap sources | Felix Uhl | 2016-08-14 | 1 | -14/+13 |
| | | | | |||||
| * | | | Added all original S60-X keymaps | Felix Uhl | 2016-08-14 | 28 | -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 changes | Felix Uhl | 2016-08-11 | 2 | -9/+10 |
| | | | | | | | | | | | | | | | | | | | | Enabled Bootmagic and ISO layouts on felix keymap Added unused pins | ||||
| * | | | Minor changes to keymaps | Felix Uhl | 2016-08-11 | 3 | -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 Uhl | 2016-08-11 | 12 | -0/+590 |
| | | | | |||||
* | | | | Merge pull request #651 from algernon/f/register16 | Jack Humbert | 2016-08-18 | 3 | -4/+44 |
|\ \ \ \ | | | | | | | | | | | Add a register/unregister_code16 pair of functions | ||||
| * | | | | Add a register/unregister_code16 pair of functions | Gergely Nagy | 2016-08-18 | 3 | -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/master | Jack Humbert | 2016-08-18 | 5 | -88/+157 |
|\ \ \ \ | | | | | | | | | | | Minor changes to keymaps and other files | ||||
| * | | | | One last change to the readme. | Xyverz | 2016-08-18 | 1 | -3/+1 |
| | | | | | |||||
| * | | | | One last formatting change | Xyverz | 2016-08-18 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | more formatting changes | Xyverz | 2016-08-18 | 1 | -90/+90 |
| | | | | | |||||
| * | | | | Hopefully this fixes the layout diagrams. | Xyverz | 2016-08-18 | 1 | -91/+91 |
| | | | | | |||||
| * | | | | Added a readme, tidied up comments in the keymap. | Xyverz | 2016-08-18 | 2 | -29/+147 |
| | | | | | |||||
| * | | | | Returned RAISE and LOWER buttons to their original functions - too many ↵ | Xyverz | 2016-08-18 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | inopportune ENTER inputs. :-( | ||||
| * | | | | Merge branch 'master' of https://github.com/Xyverz/qmk_firmware | Xyverz | 2016-08-17 | 1 | -0/+5 |
| |\ \ \ \ | |||||
| | * | | | | Update readme.md | Xyverz | 2016-08-17 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Create readme.md | Xyverz | 2016-08-17 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | Merge remote-tracking branch 'upstream/master' | Xyverz | 2016-08-17 | 27 | -108/+1615 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | this merge is necessary, | ||||
| * | | | | Adding KC_BSPC to the LT() macro for LOWER resulted in a backspace stroke ↵ | Xyverz | 2016-08-15 | 2 | -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. | Xyverz | 2016-08-15 | 1 | -6/+6 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'upstream/master' | Xyverz | 2016-08-14 | 22 | -1/+687 |
| |\ \ \ \ | |||||
| * | | | | | Setup the bottom-row modifiers to be mac-like in their arrangement. | Xyverz | 2016-08-14 | 1 | -3/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #654 from algernon/h/planck-circuit-tap-dance-fix | Jack Humbert | 2016-08-18 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | planck/circuit: Update after the latest tap-dance change | ||||
| * | | | | | planck/circuit: Update after the latest tap-dance change | Gergely Nagy | 2016-08-18 | 1 | -1/+1 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #653. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> | ||||
| | | | * | smyll typo fixed | Toni | 2016-08-18 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | amj60 variant of the readme | Toni | 2016-08-18 | 1 | -0/+30 |
| | | | | | |||||
| | | | * | first attempt at documentation for the amj60 board | Toni | 2016-08-18 | 1 | -0/+57 |
| | | | | |