Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove unneeded include | Jason Green | 2016-08-23 | 1 | -1/+0 |
* | add missing #include | Jason Green | 2016-08-23 | 1 | -0/+1 |
* | TxBolt (Steno) Serial protocol for Ergodox Ez | Jason Green | 2016-08-23 | 3 | -0/+419 |
* | Added USB Virtual Serial support | Jason Green | 2016-08-23 | 6 | -4/+276 |
* | Merge pull request #669 from fredizzimo/windows10_build_instructions | Jack Humbert | 2016-08-21 | 1 | -2/+49 |
|\ | |||||
| * | Add warning about line endings | Fred Sundvik | 2016-08-20 | 1 | -0/+2 |
| * | Add instructions for Windows 10 subsystem for Linux | Fred Sundvik | 2016-08-20 | 1 | -2/+47 |
* | | Merge pull request #668 from fredizzimo/line_endings | Jack Humbert | 2016-08-21 | 27 | -2169/+2262 |
|\ \ | |||||
| * | | Normalize line endings | Fred Sundvik | 2016-08-20 | 26 | -2169/+2169 |
| * | | Add .gitattributes to ensure correct line endings | Fred Sundvik | 2016-08-20 | 1 | -0/+93 |
| |/ | |||||
* | | Merge pull request #674 from kyleberry/master | Jack Humbert | 2016-08-21 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fixing Dvorak | Kyle Berry | 2016-08-21 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #665 from linsomniac/keymap_jafo | Jack Humbert | 2016-08-20 | 5 | -0/+213 |
|\ \ | |||||
| * | | Bringing over changes from default map. | Sean Reifschneider | 2016-08-19 | 1 | -4/+3 |
| * | | Adding jafo layout. | Sean Reifschneider | 2016-08-19 | 5 | -0/+214 |
* | | | Merge pull request #658 from Xyverz/master | Jack Humbert | 2016-08-20 | 2 | -209/+211 |
|\ \ \ | |||||
| * \ \ | Merge remote-tracking branch 'upstream/master' | Xyverz | 2016-08-19 | 66 | -92/+6560 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md. | Xyverz | 2016-08-19 | 2 | -17/+10 |
| * | | | Changed my keymap to match normal keymaps. | Xyverz | 2016-08-19 | 1 | -314/+198 |
| * | | | Added compatibility for the Infinity ErgoDox to my Ergodox keymap. | Xyverz | 2016-08-18 | 2 | -53/+178 |
* | | | | Merge pull request #630 from nrrkeene/master | Jack Humbert | 2016-08-20 | 10 | -275/+237 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | The Ordinary Layout is boring because all the keys are where you expect them ... | Nicholas Keene | 2016-08-19 | 1 | -1/+1 |
| * | | | The Ordinary Layout is boring because all the keys are where you expect them ... | Nicholas Keene | 2016-08-19 | 8 | -111/+98 |
| * | | | The Ordinary Layout is the unsurprising layout | Nicholas Keene | 2016-08-13 | 10 | -183/+158 |
* | | | | Merge pull request #662 from toneman77/iso_satan | Jack Humbert | 2016-08-19 | 6 | -85/+117 |
|\ \ \ \ | |||||
| * | | | | made a correct default KEYMAP. moved the old one to KEYMAP_ANSI | Toni | 2016-08-18 | 5 | -59/+86 |
| * | | | | 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 |
* | | | | | Merge pull request #663 from tomb0y/kc60_workman_dead | Jack Humbert | 2016-08-19 | 3 | -0/+200 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | 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 |
|\ \ \ \ \ | |||||
| * | | | | | 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 pull request #655 from Dbroqua/patch-1 | Jack Humbert | 2016-08-18 | 1 | -0/+314 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 | Wojciech Siewierski | 2016-08-19 | 1 | -2/+6 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #652 from iFreilicht/master | Jack Humbert | 2016-08-18 | 41 | -0/+5228 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | 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 |
| * | | | | | | 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 |