Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-24 | 18 | -5/+1081 |
|\ | |||||
| * | Merge pull request #677 from SmackleFunky/master | Jack Humbert | 2016-08-23 | 3 | -0/+419 |
| |\ | | | | | | | Virtual Serial Port - and a Layout that uses that virtual serial port for Plover | ||||
| | * | move to ergodox-ez only | Jason Green | 2016-08-23 | 3 | -0/+0 |
| | | | |||||
| | * | 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 |
| | | | |||||
| * | | Merge pull request #671 from Talljoe/one-hand | Jack Humbert | 2016-08-23 | 5 | -4/+50 |
| |\ \ | | | | | | | | | Add native one-handed support | ||||
| | * | | 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 |
| | | | | |||||
| * | | | Merge pull request #675 from Xyverz/master | Jack Humbert | 2016-08-23 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | Added missing item K3A to KEYMAP() variable in tv44.h | ||||
| | * \ \ | Merge remote-tracking branch 'upstream/master' | Xyverz | 2016-08-21 | 16 | -276/+451 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | * | | | 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 | ||||
| | * | | | Added support for the Kitten Paw controller | René Werner | 2016-08-22 | 9 | -0/+611 |
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | This adds support for the 2016 revision of the Kitten Paw [1] replacement controller by Bathroom Epiphanies. [1] http://bathroomepiphanies.com/controllers/ | ||||
* | | | | More notes | cbbrowne | 2016-08-24 | 1 | -3/+4 |
| | | | | |||||
* | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-22 | 98 | -606/+8317 |
|\| | | | |||||
| * | | | Fixing Dvorak | Kyle Berry | 2016-08-21 | 1 | -1/+1 |
| |/ / | | | | | | | | | | Updating with proper Dvorak layout. | ||||
| * | | Merge pull request #665 from linsomniac/keymap_jafo | Jack Humbert | 2016-08-20 | 5 | -0/+213 |
| |\ \ | | | | | | | | | Adding jafo layout. | ||||
| | * | | 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 |
| |\ \ \ | | | |/ | | |/| | Got rid of all the kludge in my ErgoDox keymap. | ||||
| | * | | Merge remote-tracking branch 'upstream/master' | Xyverz | 2016-08-19 | 61 | -86/+6509 |
| | |\ \ | |||||
| | * | | | 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 |
| | | | | | | | | | | | | | | | | | | | | Updated readme.md to reflect this change. | ||||
| * | | | | Merge pull request #630 from nrrkeene/master | Jack Humbert | 2016-08-20 | 10 | -275/+237 |
| |\ \ \ \ | | |_|/ / | |/| | | | The Ordinary Layout is the unsurprising layout | ||||
| | * | | | The Ordinary Layout is boring because all the keys are where you expect them ↵ | Nicholas Keene | 2016-08-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | to be | ||||
| | * | | | The Ordinary Layout is boring because all the keys are where you expect them ↵ | Nicholas Keene | 2016-08-19 | 8 | -111/+98 |
| | | | | | | | | | | | | | | | | | | | | to be | ||||
| | * | | | 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 |
| |\ \ \ \ | | | | | | | | | | | | | 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 |
| | | | | | | |||||
| * | | | | | forgot media keys | Toni | 2016-08-19 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge remote-tracking branch 'origin/master' into amj60 | Toni | 2016-08-19 | 47 | -89/+5699 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | merge with upstream | ||||
| | * | | | | | Added dbroqua layout for planck keyboard | Damien | 2016-08-18 | 1 | -0/+314 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #652 from iFreilicht/master | Jack Humbert | 2016-08-18 | 40 | -0/+5227 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | 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 | 100 | -1407/+6306 |
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | 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 |
| | | | | | | | |