Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/jackhumbert/qmk_firmware | Olivier | 2016-08-25 | 60 | -2185/+3838 |
|\ | |||||
| * | Merge pull request #679 from algernon/h/ucis/subproject-fix | Jack Humbert | 2016-08-24 | 2 | -2/+6 |
| |\ | |||||
| | * | quantum: Move qk_ucis_state to process_unicode.c | Gergely Nagy | 2016-08-24 | 2 | -2/+6 |
| * | | Merge pull request #646 from nclundsten/master | Jack Humbert | 2016-08-24 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | |||||
| | * | trailing slash | Nigel Lundsten | 2016-08-17 | 1 | -1/+1 |
| | * | fix ergodox link (again?) | Nigel Lundsten | 2016-08-17 | 1 | -1/+1 |
| * | | Merge pull request #677 from SmackleFunky/master | Jack Humbert | 2016-08-23 | 9 | -4/+695 |
| |\ \ | |||||
| | * | | move to ergodox-ez only | Jason Green | 2016-08-23 | 4 | -1/+1 |
| | * | | 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 #671 from Talljoe/one-hand | Jack Humbert | 2016-08-23 | 10 | -5/+210 |
| |\ \ \ | |||||
| | * | | | Add one-hand key to planck/experimental keymap. | Joe Wasson | 2016-08-20 | 2 | -4/+5 |
| | * | | | Add default swap configs for a couple of boards. | Joe Wasson | 2016-08-20 | 3 | -0/+45 |
| | * | | | Improve one-hand support by adding more actions and tap keys. | Joe Wasson | 2016-08-20 | 3 | -9/+89 |
| | * | | | Add one-hand support. | Joe Wasson | 2016-08-20 | 5 | -1/+80 |
| * | | | | Merge pull request #673 from coderkun/master | Jack Humbert | 2016-08-23 | 1 | -0/+2 |
| |\ \ \ \ | |||||
| | * | | | | Drop method to set Unicode input key and declare start and finish methods as ... | coderkun | 2016-08-21 | 2 | -13/+4 |
| | * | | | | Add method to set Unicode input key for ISO 14755 | coderkun | 2016-08-21 | 2 | -2/+13 |
| | |/ / / | |||||
| * | | | | Merge pull request #675 from Xyverz/master | Jack Humbert | 2016-08-23 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge remote-tracking branch 'upstream/master' | Xyverz | 2016-08-21 | 44 | -2447/+2762 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | * | | | | Added missing key K3A to KEYMAP() macro in tv44.h | Xyverz | 2016-08-21 | 1 | -1/+1 |
| * | | | | | Merge pull request #676 from ickerwx/kitten_paw | Jack Humbert | 2016-08-23 | 9 | -0/+611 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Added support for the Kitten Paw controller | René Werner | 2016-08-22 | 9 | -0/+611 |
| | | |/ / | | |/| | | |||||
| * | | | | 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 |
| |/ / / / | |||||
* | | | | | Rename file following upstream folder rename. | Olivier | 2016-08-20 | 1 | -0/+0 |
* | | | | | Merge https://github.com/jackhumbert/qmk_firmware | Olivier | 2016-08-20 | 649 | -2973/+35034 |
|\| | | | | |||||
| * | | | | 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 |