summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixed NO_SUSPEND_POWER_DOWN handlingWilba65822016-11-231-1/+7
* Merge pull request #898 from PureSpider/backlight-fixJack Humbert2016-11-221-2/+2
|\
| * Set backlight status to on if it's at maximum brightness already and the brig...PureSpider2016-11-221-2/+2
* | Merge pull request #896 from h-youhei/jp106Jack Humbert2016-11-221-0/+62
|\ \
| * | Add japanese keymaph-youhei2016-11-221-0/+62
|/ /
* | Merge pull request #894 from dchagniot/ergodoxDvorakEmacsJack Humbert2016-11-212-0/+235
|\ \
| * | typo fixDidier Chagniot2016-11-202-19/+19
| * | readme.md updatedDidier Chagniot2016-09-101-0/+70
| * | typing with itDidier Chagniot2016-09-091-0/+165
* | | Merge pull request #893 from Sihui/sh-hhkb-jpJack Humbert2016-11-213-0/+147
|\ \ \
| * | | add del to new cmdSihui Huang2016-11-201-1/+1
| * | | add space to NewCmd layerSihui Huang2016-11-201-1/+1
| |\ \ \
| | * | | Update README.mdSihui Huang2016-11-201-1/+1
| * | | | add space to NewCmd layerSihui Huang2016-11-202-2/+2
| |/ / /
| * | | Update README.mdSihui Huang2016-11-201-1/+2
| * | | Update README.mdSihui Huang2016-11-201-1/+2
| * | | add sh-hhkb-jp layersSihui Huang2016-11-203-0/+145
* | | | Merge pull request #892 from fredizzimo/disable_ergodox_lcdJack Humbert2016-11-212-26/+5
|\ \ \ \
| * | | | Always initialze the Infinity Ergodox backlightFred Sundvik2016-11-202-26/+5
| |/ / /
* | | | Merge pull request #891 from g-sam/galson-keymapJack Humbert2016-11-213-0/+196
|\ \ \ \
| * | | | adds galson keymapsamgalson@gmail.com2016-11-193-0/+196
* | | | | Merge pull request #890 from algernon/f/space-cadet/timeoutJack Humbert2016-11-211-2/+9
|\ \ \ \ \
| * | | | | Fix the Space Cadet timeout codeGergely Nagy2016-11-191-0/+4
| * | | | | Add a timeout to space-cadet shift.Gergely Nagy2016-11-191-2/+5
| |/ / / /
* | | | | Merge pull request #888 from climbalima/masterJack Humbert2016-11-213-4/+12
|\ \ \ \ \
| * | | | | changed readmeclimbalima2016-11-192-2/+3
| * | | | | added the pinout for pro micro into maxipadclimbalima2016-11-192-3/+10
* | | | | | Merge pull request #887 from profet23/atreus62Jack Humbert2016-11-218-0/+622
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Adding readme placeholderBenjamin Grabkowitz2016-11-161-0/+10
| * | | | | Adding Support for atreus62 keyboard. https://github.com/profet23/atreus62Benjamin Grabkowitz2016-11-167-0/+612
* | | | | | Merge pull request #878 from sethbc/add_sethbc_gh60_keymapJack Humbert2016-11-195-68/+148
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | remove KC expansion from GH60Seth Chandler2016-11-194-99/+55
| * | | | | move KC expansion to separate macrosSeth Chandler2016-11-194-23/+66
| * | | | | merge upstream/masterSeth Chandler2016-11-1949-378/+2213
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | don't always detect a matrix change (fixes debounce)Jack Humbert2016-11-181-1/+1
| |_|/ / / |/| | | |
* | | | | Merge pull request #883 from climbalima/masterJack Humbert2016-11-1625-129/+760
|\ \ \ \ \
| * | | | | fixed readme conflictsclimbalima2016-11-161-20/+2
| * | | | | should have fixed conflixedclimbalima2016-11-1613-268/+10
| * | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareclimbalima2016-11-1624-249/+1453
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #882 from seebs/masterJack Humbert2016-11-162-0/+244
|\ \ \ \ \ \
| * | | | | | dvorak/plover keyboard layoutSeebs2016-11-162-0/+244
|/ / / / / /
* | | | | | Merge pull request #880 from psyill/masterJack Humbert2016-11-166-0/+678
|\ \ \ \ \ \
| * | | | | | Added keymap "videck", an ErgoDox keymap for Vi(m) users.Hans EllegÄrd2016-11-136-0/+678
* | | | | | | Merge pull request #879 from sethbc/update_sethbc_ergodox_keymapJack Humbert2016-11-163-13/+3
|\ \ \ \ \ \ \
| * | | | | | | update sethbc ergodox keymapSeth Chandler2016-11-133-13/+3
| |/ / / / / /
* | | | | | | Merge pull request #877 from sethbc/update_sethbc_satan_keymapJack Humbert2016-11-161-7/+7
|\ \ \ \ \ \ \
| * | | | | | | oops, fixed inverted if statementSeth Chandler2016-11-131-6/+6
| * | | | | | | update sethbc keymapSeth Chandler2016-11-121-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #876 from Dbroqua/masterJack Humbert2016-11-163-1/+120
|\ \ \ \ \ \ \
| * | | | | | | Merge pull request #12 from jackhumbert/masterDamien2016-11-127-4/+237
| |\| | | | | |