Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | In Progress Merge | IBNobody | 2016-08-20 | 4 | -18/+137 |
| | |||||
* | Initial Commmit | IBNobody | 2016-08-20 | 10 | -1/+387 |
| | |||||
* | Merge | IBNobody | 2016-08-20 | 1 | -356/+194 |
| | |||||
* | Merge | IBNobody | 2016-08-20 | 0 | -0/+0 |
|\ | |||||
| * | Merge | IBNobody | 2016-08-20 | 0 | -0/+0 |
| |\ | |||||
| | * | Merge https://github.com/IBNobody/qmk_firmware | IBNobody | 2016-08-19 | 1 | -22/+22 |
| | |\ | |||||
| | | * | fixed color detection routine in makefile | IBNobody | 2016-06-11 | 1 | -30/+28 |
| | | | | |||||
| | | * | Merge remote-tracking branch 'remotes/jackhumbert/master' | IBNobody | 2016-06-11 | 728 | -90650/+141429 |
| | | |\ | |||||
| | | * \ | Merge remote-tracking branch 'remotes/jackhumbert/master' | IBNobody | 2016-05-24 | 32 | -792/+626 |
| | | |\ \ | |||||
| | | * \ \ | Merge remote-tracking branch 'remotes/jackhumbert/master' | IBNobody | 2016-05-24 | 124 | -4257/+11726 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | IBNobody | 2016-05-02 | 142 | -10819/+28668 |
| | | |\ \ \ \ | |||||
| | * | | | | | | fixed color detection routine in makefile | IBNobody | 2016-08-19 | 1 | -194/+356 |
| | | | | | | | | |||||
| * | | | | | | | fixed color detection routine in makefile | IBNobody | 2016-08-19 | 1 | -194/+356 |
| |/ / / / / / | |||||
* | | | | | | | fixed color detection routine in makefile | IBNobody | 2016-08-20 | 1 | -194/+195 |
| | | | | | | | |||||
* | | | | | | | fixed color detection routine in makefile | IBNobody | 2016-08-20 | 1 | -0/+161 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #662 from toneman77/iso_satan | Jack Humbert | 2016-08-19 | 6 | -85/+117 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Satan Cleanup | ||||
| * | | | | | | made a correct default KEYMAP. moved the old one to KEYMAP_ANSI | Toni | 2016-08-18 | 5 | -59/+86 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed all layouts that were referencing KEYMAP to KEYMAP_ANSI whitespace prettyfying | ||||
| * | | | | | | cleanup, readability , shift swap in ISO_SPLIT_RSHIFT | Toni | 2016-08-18 | 1 | -17/+20 |
| | | | | | | | |||||
| * | | | | | | corrected the split rshift key to reality | Toni | 2016-08-18 | 2 | -9/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed my keymap in the process to adjust to that | ||||
* | | | | | | | Merge pull request #663 from tomb0y/kc60_workman_dead | Jack Humbert | 2016-08-19 | 3 | -0/+200 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add the workman-dead layout for kc60 | ||||
| * | | | | | | | Add the workman-dead layout for kc60 | zs | 2016-08-19 | 3 | -0/+200 |
| | | | | | | | | |||||
* | | | | | | | | 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 |