summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* add alphadox layouts to atreus and ergodoxAlpha Chen2016-10-25
* Merge pull request #833 from h-parks/masterErez Zukerman2016-10-20
|\
| * Win10 Writer's Block - An ErgoDox Keymaph-parks2016-10-19
| * Win10 Writer's Block - An ErgoDox Keymaph-parks2016-10-18
* | Merge pull request #832 from PhoenixRion/masterErez Zukerman2016-10-20
|\ \ | |/ |/|
| * update header fileRyan Ascheman2016-10-18
| * didn't read PR comment close enough, correcting folderRyan Ascheman2016-10-18
| * moving keymap to new locationRyan Ascheman2016-10-18
| * Merge remote-tracking branch 'upstream/master'Ryan Ascheman2016-10-18
| |\ | |/ |/|
* | Merge pull request #829 from r2d2rogers/masterJack Humbert2016-10-18
|\ \
| * | Update ez.cRob Rogers2016-10-18
| * | Move hand_swap_config to ez.c, removes error for infinityRob Rogers2016-10-17
* | | Merge pull request #824 from dsvensson/pegasushoofJack Humbert2016-10-18
|\ \ \
| * | | Support the Pegasus Hoof controller.Daniel Svensson2016-10-13
* | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareJack Humbert2016-10-18
|\ \ \ \
| * \ \ \ Merge pull request #826 from algernon/ergodox-ez/algernonErez Zukerman2016-10-17
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | ergodox: Update algernon's keymap to v1.9Gergely Nagy2016-10-16
| | |/ /
* | / / removes planck/rev3 temporarilyJack Humbert2016-10-18
|/ / /
* | | Update MakefileJack Humbert2016-10-16
* | | Merge pull request #815 from priyadi/unicode_mapJack Humbert2016-10-16
|\ \ \
| * | | Add example keymapPriyadi Iman Nurcahyo2016-10-10
| * | | Unicode map framework. Allow unicode up to 0xFFFFF using separatePriyadi Iman Nurcahyo2016-10-10
* | | | Merge pull request #825 from replicaJunction/pr-vscodeJack Humbert2016-10-16
|\ \ \ \ | |_|/ / |/| | |
| * | | Added VS Code dir to .gitignoreJoshua T2016-10-15
|/ / /
* | | Merge pull request #818 from pvinis/pvinis-keymapErez Zukerman2016-10-13
|\ \ \
| * | | add readmePavlos Vinieratos2016-10-11
| * | | use wait_ms instead of _delay_msPavlos Vinieratos2016-10-11
| * | | add messengerPavlos Vinieratos2016-10-11
| * | | init keymapPavlos Vinieratos2016-10-11
* | | | Merge pull request #822 from jackhumbert/hotfix/simplify_toErez Zukerman2016-10-13
|\ \ \ \ | |/ / / |/| | |
| * | | [Jack & Erez] Simplifies and documents TOJack & Erez2016-10-12
|/ / /
* | | Merge pull request #803 from coderkun/coderkun_neo2Erez Zukerman2016-10-10
|\ \ \
| * | | Overwrite method hex_to_unicode() for make it compatible with Neocoderkun2016-10-03
| * | | Merge branch 'master' into coderkun_neo2coderkun2016-10-03
| |\ \ \
| * \ \ \ Merge branch 'master' into coderkun_neo2coderkun2016-10-02
| |\ \ \ \
| * | | | | Add double arrow Unicode characters to FMU layercoderkun2016-10-02
* | | | | | Merge pull request #809 from nathanejohnson/osx_whiskey_tango_foxtrot_capslockErez Zukerman2016-10-10
|\ \ \ \ \ \
| * | | | | | Adding whiskey_tango_foxtrot_capslock ergodox keymapNathan Johnson2016-10-09
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #808 from npoirey/masterJack Humbert2016-10-10
|\ \ \ \ \ \
| * | | | | | Updated Readme to help windows users use docker for buildnpoirey2016-10-07
| * | | | | | Add Altgr combination for non US layoutsnpoirey2016-10-07
| |/ / / / /
* | | | | | Merge pull request #811 from Vifon/planck_keymap_vifonJack Humbert2016-10-10
|\ \ \ \ \ \
| * | | | | | New Planck keymap: vifonWojciech Siewierski2016-10-09
| |/ / / / /
* | | | | | Merge pull request #810 from Vifon/dynamic_macrosJack Humbert2016-10-10
|\ \ \ \ \ \
| * | | | | | Reduce the default dynamic macro bufferWojciech Siewierski2016-10-09
| |/ / / / /
* | | | | | Merge pull request #814 from fredizzimo/rgb_tuningJack Humbert2016-10-10
|\ \ \ \ \ \
| * | | | | | CIE 1931 dim curveFred Sundvik2016-10-09
| * | | | | | Apply the dim curve to the RGB outputFred Sundvik2016-10-09
| |/ / / / /
* | | | | | Merge pull request #813 from fredizzimo/add_cluecard_rgb_effectsJack Humbert2016-10-10
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update the Cluecard readme filesFred Sundvik2016-10-09