summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Reduced TAPPING_TERM to 150Joshua T2016-10-151-4/+2
* Added Ctrl+` (ConEmu shortcut)Joshua T2016-10-151-1/+1
* Merge remote-tracking branch 'upstream/master'Joshua T2016-10-15192-2351/+10300
|\
| * Merge pull request #818 from pvinis/pvinis-keymapErez Zukerman2016-10-134-0/+511
| |\
| | * add readmePavlos Vinieratos2016-10-112-0/+72
| | * use wait_ms instead of _delay_msPavlos Vinieratos2016-10-111-7/+7
| | * add messengerPavlos Vinieratos2016-10-111-2/+3
| | * init keymapPavlos Vinieratos2016-10-112-0/+438
| * | Merge pull request #822 from jackhumbert/hotfix/simplify_toErez Zukerman2016-10-133-7/+12
| |\ \ | | |/ | |/|
| | * [Jack & Erez] Simplifies and documents TOJack & Erez2016-10-123-7/+12
| |/
| * Merge pull request #803 from coderkun/coderkun_neo2Erez Zukerman2016-10-101-2/+27
| |\
| | * Overwrite method hex_to_unicode() for make it compatible with Neocoderkun2016-10-031-0/+25
| | * Merge branch 'master' into coderkun_neo2coderkun2016-10-031-0/+1
| | |\
| | * \ Merge branch 'master' into coderkun_neo2coderkun2016-10-02346-12401/+20510
| | |\ \
| | * | | Add double arrow Unicode characters to FMU layercoderkun2016-10-021-2/+2
| * | | | Merge pull request #809 from nathanejohnson/osx_whiskey_tango_foxtrot_capslockErez Zukerman2016-10-103-0/+269
| |\ \ \ \
| | * | | | Adding whiskey_tango_foxtrot_capslock ergodox keymapNathan Johnson2016-10-093-0/+269
| * | | | | Merge pull request #808 from npoirey/masterJack Humbert2016-10-102-0/+4
| |\ \ \ \ \
| | * | | | | Updated Readme to help windows users use docker for buildnpoirey2016-10-071-0/+3
| | * | | | | Add Altgr combination for non US layoutsnpoirey2016-10-071-0/+1
| | |/ / / /
| * | | | | Merge pull request #811 from Vifon/planck_keymap_vifonJack Humbert2016-10-103-0/+303
| |\ \ \ \ \
| | * | | | | New Planck keymap: vifonWojciech Siewierski2016-10-093-0/+303
| | |/ / / /
| * | | | | Merge pull request #810 from Vifon/dynamic_macrosJack Humbert2016-10-102-4/+9
| |\ \ \ \ \
| | * | | | | Reduce the default dynamic macro bufferWojciech Siewierski2016-10-092-4/+9
| | |/ / / /
| * | | | | Merge pull request #814 from fredizzimo/rgb_tuningJack Humbert2016-10-101-22/+33
| |\ \ \ \ \
| | * | | | | CIE 1931 dim curveFred Sundvik2016-10-091-17/+30
| | * | | | | Apply the dim curve to the RGB outputFred Sundvik2016-10-091-5/+3
| | |/ / / /
| * | | | | Merge pull request #813 from fredizzimo/add_cluecard_rgb_effectsJack Humbert2016-10-107-0/+84
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Update the Cluecard readme filesFred Sundvik2016-10-092-1/+9
| | * | | | Tune snake and knight intervals for CluecardFred Sundvik2016-10-091-0/+3
| | * | | | Tunable RGB light intervalsFred Sundvik2016-10-092-0/+12
| | * | | | Tune the snake and knight effect parameters for CluecardFred Sundvik2016-10-091-0/+3
| | * | | | Add keymap with audio disabled but RGB effects enabledFred Sundvik2016-10-094-0/+58
| |/ / / /
| * | | | Merge pull request #807 from hot-leaf-juice/masterJack Humbert2016-10-062-7/+7
| |\ \ \ \
| | * | | | updated readmeCallum Oakley2016-10-061-3/+3
| | * | | | added lock screen button and fixed error in diagramCallum Oakley2016-10-061-4/+4
| * | | | | Merge pull request #805 from SethSenpai/gamenumJack Humbert2016-10-067-0/+443
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | updated the wrong makefile like a dummySethSenpai2016-10-041-73/+3
| | * | | | added rules.mkSethSenpai2016-10-041-0/+73
| | * | | | updated readme with imagesSethSenpai2016-10-031-1/+9
| | * | | | update readmeSethSenpai2016-10-031-6/+8
| | * | | | moved folder, update readmeSethSenpai2016-10-036-1/+1
| | * | | | added gamenum handwired keyboardSethSenpai2016-10-036-0/+430
| | | |/ / | | |/| |
| * | | | Merge pull request #804 from algernon/ergodox-ez/algernonErez Zukerman2016-10-039-175/+212
| |\ \ \ \
| | * | | | ergodox: Update algernon's keymap to v1.8Gergely Nagy2016-10-039-175/+212
| |/ / / /
| * | | | Merge pull request #799 from coderkun/masterJack Humbert2016-10-031-0/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Declare Unicode method hex_to_keycode() as “weak”coderkun2016-10-021-0/+1
| | |/ /
| * | | Merge pull request #798 from Dbroqua/masterJack Humbert2016-10-031-13/+35
| |\ \ \
| | * | | - Fixed key name in default layer definitiondbroqua2016-10-011-1/+1
| | * | | Merge remote-tracking branch 'origin/master'dbroqua2016-10-0124-692/+1251
| | |\ \ \