summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-10-31Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne4-67/+122
2016-10-30Merge pull request #839 from priyadi/planck-priyadi-modificationJack Humbert2-58/+98
Update priyadi's keymap for Planck; added readme
2016-10-30Merge pull request #854 from slebedev/masterJack Humbert1-1/+1
Add link to article about Unicode Hex Input in readme
2016-10-30Merge pull request #857 from fredizzimo/fix_makefile_too_long_bashJack Humbert1-8/+23
Run each sumbmake in a separate shell
2016-10-30Run each sumbmake in a separate shellFred Sundvik1-8/+23
This will fix the situation where the commandline gets too long when there are many keyboards and keymaps.
2016-10-29Add link to article about Unicode Hex Input in readmeSergey Lebedev1-1/+1
For me it wasn't clear what is `Unicode Hex Input`, that article clarifies it (at least for me).
2016-10-26Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne18-51/+613
2016-10-26Merge pull request #827 from Dbroqua/masterJack Humbert3-6/+88
Updated dbroqua layout for HHKB keyboard and added new layout for KC60
2016-10-26Merge pull request #849 from hot-leaf-juice/masterJack Humbert1-4/+4
tiny keymap change
2016-10-26Merge pull request #848 from andrebeat/fix-dockerfileJack Humbert1-1/+2
Add subproject env var to dockerfile
2016-10-26Merge pull request #847 from yinshanyang/masterJack Humbert1-0/+13
added notes on using Arduino Pro Micro 3.3V with Let’s Split
2016-10-26Merge pull request #844 from priyadi/unicode_wincompose_inputJack Humbert2-4/+10
Unicode WinCompose input method
2016-10-26Merge pull request #842 from priyadi/unicode_map_lengthJack Humbert2-9/+35
UNICODE_MAP: remove 5 char limit; ignore leading zeroes; handle OS limitations
2016-10-26Merge pull request #841 from jacwib/masterJack Humbert3-27/+118
Update jacwib keymap to version 1.2
2016-10-26Merge pull request #831 from kejadlen/masterJack Humbert5-0/+261
add alphadox layouts to atreus and ergodox
2016-10-26Merge pull request #834 from kazufukurou/masterJack Humbert1-0/+82
add programmer dvorak keymap
2016-10-25[alphadox] remove tmk reset codeAlpha Chen2-10/+0
2016-10-25[ergodox][alphadox] undefine tapping_term, ignore_mod_tap_interruptAlpha Chen1-0/+3
2016-10-25add alphadox layouts to atreus and ergodoxAlpha Chen5-0/+268
2016-10-25replace lock key with general power keyCallum Oakley1-2/+2
2016-10-25switched to standard volume keysCallum Oakley1-2/+2
2016-10-24add subproject env var to dockerfileAndre Silva1-1/+2
2016-10-24added notes on using Arduino Pro Micro 3.3V with Let’s SplitYin Shanyang1-0/+13
2016-10-23Merge branch 'master' of github.com:cbbrowne/qmk_firmwareChris Browne0-0/+0
2016-10-23Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChris Browne33-127/+1549
2016-10-231.2 updatejacwib3-20/+105
2016-10-23Use WinCompose unicode input method instead of HexNumpadPriyadi Iman Nurcahyo1-1/+1
2016-10-23Unicode WinCompose input methodPriyadi Iman Nurcahyo2-4/+10
2016-10-23UNICODE_MAP: remove 5 char limit; ignore leading zeroes; handle OS limitationsPriyadi Iman Nurcahyo2-9/+35
2016-10-22Update readme to reflect 1.1 changes.jacwib1-1/+1
2016-10-22Update keymap to reflect 1.1 changes.jacwib1-9/+9
2016-10-22Update readme to reflect changesjacwib1-0/+6
2016-10-22Update priyadi's keymap for Planck; added readmePriyadi Iman Nurcahyo2-57/+97
2016-10-20Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne10-0/+676
2016-10-20Merge pull request #833 from h-parks/masterErez Zukerman8-0/+482
Win10 Writer's Block - An ErgoDox Keymap
2016-10-20Merge pull request #832 from PhoenixRion/masterErez Zukerman2-0/+194
Phoenix Layout
2016-10-19add programmer dvorak keymapArtyom Mironov1-0/+82
2016-10-19Win10 Writer's Block - An ErgoDox Keymaph-parks2-9/+12
fix for compiling on infinity: replaced `_delay_ms()' with `wait_ms()' included "wait.h"
2016-10-19Win10 Writer's Block - An ErgoDox Keymaph-parks8-0/+479
This is a QWERTY layout for ErgoDox on QMK. It's designed to work well in MS Office-like environments. It's tested on Windows 7 and 10.
2016-10-19Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne23-127/+873
2016-10-18update header fileRyan Ascheman1-1/+1
2016-10-18didn't read PR comment close enough, correcting folderRyan Ascheman2-0/+0
2016-10-18moving keymap to new locationRyan Ascheman2-0/+0
2016-10-18Merge remote-tracking branch 'upstream/master'Ryan Ascheman6926-2418267/+105172
* upstream/master: (1239 commits) Update ez.c removes planck/rev3 temporarily Move hand_swap_config to ez.c, removes error for infinity Update Makefile ergodox: Update algernon's keymap to v1.9 Added VS Code dir to .gitignore Support the Pegasus Hoof controller. [Jack & Erez] Simplifies and documents TO add readme use wait_ms instead of _delay_ms add messenger init keymap Add example keymap Adding whiskey_tango_foxtrot_capslock ergodox keymap Unicode map framework. Allow unicode up to 0xFFFFF using separate mapping table CIE 1931 dim curve Apply the dim curve to the RGB output Update the Cluecard readme files Tune snake and knight intervals for Cluecard Tunable RGB light intervals ...
2016-10-18Merge pull request #829 from r2d2rogers/masterJack Humbert2-21/+22
Move hand_swap_config to ez.c, removes error for infinity
2016-10-18Merge pull request #824 from dsvensson/pegasushoofJack Humbert11-0/+662
Support the Pegasus Hoof controller.
2016-10-18Update ez.cRob Rogers1-1/+0
2016-10-18Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareJack Humbert9-103/+189
2016-10-18removes planck/rev3 temporarilyJack Humbert1-3/+0
2016-10-18Merge pull request #826 from algernon/ergodox-ez/algernonErez Zukerman9-103/+189
ergodox: Update algernon's keymap to v1.9