Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge upstream | Lior Haim | 2016-10-23 | 23 | -21/+1360 |
|\ | |||||
| * | Merge pull request #833 from h-parks/master | Erez Zukerman | 2016-10-20 | 8 | -0/+482 |
| |\ | |||||
| | * | Win10 Writer's Block - An ErgoDox Keymap | h-parks | 2016-10-19 | 2 | -9/+12 |
| | * | Win10 Writer's Block - An ErgoDox Keymap | h-parks | 2016-10-18 | 8 | -0/+479 |
| * | | Merge pull request #832 from PhoenixRion/master | Erez Zukerman | 2016-10-20 | 2 | -0/+194 |
| |\ \ | | |/ | |/| | |||||
| | * | update header file | Ryan Ascheman | 2016-10-18 | 1 | -1/+1 |
| | * | didn't read PR comment close enough, correcting folder | Ryan Ascheman | 2016-10-18 | 2 | -0/+0 |
| | * | moving keymap to new location | Ryan Ascheman | 2016-10-18 | 2 | -0/+0 |
| | * | Merge remote-tracking branch 'upstream/master' | Ryan Ascheman | 2016-10-18 | 6939 | -2419915/+106820 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #829 from r2d2rogers/master | Jack Humbert | 2016-10-18 | 2 | -21/+22 |
| |\ \ | |||||
| | * | | Update ez.c | Rob Rogers | 2016-10-18 | 1 | -1/+0 |
| | * | | Move hand_swap_config to ez.c, removes error for infinity | Rob Rogers | 2016-10-17 | 2 | -20/+22 |
| * | | | Merge pull request #824 from dsvensson/pegasushoof | Jack Humbert | 2016-10-18 | 11 | -0/+662 |
| |\ \ \ | |||||
| | * | | | Support the Pegasus Hoof controller. | Daniel Svensson | 2016-10-13 | 11 | -0/+662 |
| | | | * | update volume control to match arrow change | Ryan Ascheman | 2016-05-12 | 1 | -2/+2 |
| | | | * | update readme | Ryan Ascheman | 2016-04-25 | 3 | -6/+6 |
| | | | * | initial changes, no doc changes | Ryan Ascheman | 2016-04-19 | 4 | -0/+194 |
* | | | | | fixed copy-cut-paste buttons | twentylives | 2016-10-21 | 1 | -5/+5 |
* | | | | | Merge branch 'master' of https://github.com/20lives/qmk_firmware | twentylives | 2016-10-20 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | fix readme | 20lives | 2016-10-19 | 1 | -2/+2 |
* | | | | | | fixed base layer = key | twentylives | 2016-10-20 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | update pics and readme | twentylives | 2016-10-19 | 5 | -133/+122 |
* | | | | | Update readme.md | 20lives | 2016-10-18 | 1 | -3/+5 |
* | | | | | Update readme.md | 20lives | 2016-10-18 | 1 | -1/+3 |
* | | | | | adding dvorak hebrew layout | twentylives | 2016-10-18 | 3 | -0/+230 |
|/ / / / | |||||
* | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Jack Humbert | 2016-10-18 | 9 | -103/+189 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #826 from algernon/ergodox-ez/algernon | Erez Zukerman | 2016-10-17 | 9 | -103/+189 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | ergodox: Update algernon's keymap to v1.9 | Gergely Nagy | 2016-10-16 | 9 | -103/+189 |
| | |/ / | |||||
* | / / | removes planck/rev3 temporarily | Jack Humbert | 2016-10-18 | 1 | -3/+0 |
|/ / / | |||||
* | | | Update Makefile | Jack Humbert | 2016-10-16 | 1 | -72/+1 |
* | | | Merge pull request #815 from priyadi/unicode_map | Jack Humbert | 2016-10-16 | 9 | -0/+495 |
|\ \ \ | |||||
| * | | | Add example keymap | Priyadi Iman Nurcahyo | 2016-10-10 | 3 | -0/+444 |
| * | | | Unicode map framework. Allow unicode up to 0xFFFFF using separate | Priyadi Iman Nurcahyo | 2016-10-10 | 6 | -0/+51 |
* | | | | Merge pull request #825 from replicaJunction/pr-vscode | Jack Humbert | 2016-10-16 | 1 | -0/+1 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Added VS Code dir to .gitignore | Joshua T | 2016-10-15 | 1 | -0/+1 |
|/ / / | |||||
* | | | Merge pull request #818 from pvinis/pvinis-keymap | Erez Zukerman | 2016-10-13 | 4 | -0/+511 |
|\ \ \ | |||||
| * | | | add readme | Pavlos Vinieratos | 2016-10-11 | 2 | -0/+72 |
| * | | | use wait_ms instead of _delay_ms | Pavlos Vinieratos | 2016-10-11 | 1 | -7/+7 |
| * | | | add messenger | Pavlos Vinieratos | 2016-10-11 | 1 | -2/+3 |
| * | | | init keymap | Pavlos Vinieratos | 2016-10-11 | 2 | -0/+438 |
* | | | | Merge pull request #822 from jackhumbert/hotfix/simplify_to | Erez Zukerman | 2016-10-13 | 3 | -7/+12 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | [Jack & Erez] Simplifies and documents TO | Jack & Erez | 2016-10-12 | 3 | -7/+12 |
|/ / / | |||||
* | | | Merge pull request #803 from coderkun/coderkun_neo2 | Erez Zukerman | 2016-10-10 | 1 | -2/+27 |
|\ \ \ | |||||
| * | | | Overwrite method hex_to_unicode() for make it compatible with Neo | coderkun | 2016-10-03 | 1 | -0/+25 |
| * | | | Merge branch 'master' into coderkun_neo2 | coderkun | 2016-10-03 | 1 | -0/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into coderkun_neo2 | coderkun | 2016-10-02 | 346 | -12401/+20510 |
| |\ \ \ \ | |||||
| * | | | | | Add double arrow Unicode characters to FMU layer | coderkun | 2016-10-02 | 1 | -2/+2 |
* | | | | | | Merge pull request #809 from nathanejohnson/osx_whiskey_tango_foxtrot_capslock | Erez Zukerman | 2016-10-10 | 3 | -0/+269 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Adding whiskey_tango_foxtrot_capslock ergodox keymap | Nathan Johnson | 2016-10-09 | 3 | -0/+269 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #808 from npoirey/master | Jack Humbert | 2016-10-10 | 2 | -0/+4 |
|\ \ \ \ \ \ |