summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-09-06Fix ergodox_yoruian XKB namingThomas Fitzsimmons2-2/+2
2016-09-06Add new ErgoDox EZ keymap, YORUIANThomas Fitzsimmons6-0/+277
2016-09-06Merge pull request #686 from coderkun/coderkun_neo2Erez Zukerman2-7/+19
2016-09-06Merge pull request #678 from algernon/ergodox-ez/algernonErez Zukerman8-523/+552
2016-09-05Merge pull request #724 from sgoodwin/masterJack Humbert3-0/+268
2016-09-05Merge pull request #722 from fredizzimo/fix_always_linkingJack Humbert1-2/+4
2016-09-05Merge pull request #719 from IBNobody/masterJack Humbert3-221/+319
2016-09-05Merge pull request #716 from MajorKoos/masterJack Humbert7-0/+474
2016-09-05Merge pull request #711 from hot-leaf-juice/masterJack Humbert2-19/+27
2016-09-05Merge pull request #710 from algernon/h/tap-dance/keyup-seq-start-fixJack Humbert1-2/+3
2016-09-05Add my keymap.Samuel Ryan Goodwin3-0/+268
2016-09-04Fix the ldflags.txt and obj.txt checksFred Sundvik1-2/+4
2016-09-04Merge pull request #4 from IBNobody/update_atomic_planck_pvc_keymapsIBNobody2-199/+238
2016-09-04Added diagonal mice macros, breathing ala AtomicIBNobody2-199/+238
2016-09-04Moved breathing backlighting section in readme.mdIBNobody1-60/+60
2016-09-04Updated doc to contain breathing information.IBNobody1-29/+144
2016-09-04Updated readme to have better backlight breathing info.IBNobody1-160/+104
2016-09-03Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody10-22/+443
2016-09-03Add rules.mk fileMajor Koos1-0/+69
2016-09-03Add support for JD40 MKII PCBMajor Koos6-0/+405
2016-09-02Removing/editing non applicable readmeprofet234-171/+2
2016-09-02Adding 80 Key Ergodox Supportprofet2321-0/+2278
2016-09-02fixed incorrect key combination for locking screen on macOSCallum Oakley2-5/+5
2016-09-01changed some of the wording in the readmeCallum Oakley1-4/+4
2016-09-01changed order of modifiers after experimentation, updated readmeCallum Oakley2-12/+7
2016-09-01Merge remote-tracking branch 'upstream/master'Callum Oakley441-13735/+31253
2016-09-01tap-dance: Do not start a sequence on keyupGergely Nagy1-2/+3
2016-08-31Merge pull request #707 from algernon/f/unicode/get-modeJack Humbert2-0/+5
2016-08-31process_unicode: Add get_unicode_input_mode()Gergely Nagy2-0/+5
2016-08-31Merge pull request #705 from VoodaGod/bone2planckJack Humbert3-22/+44
2016-08-30Merge branch 'master'Jason Janse van Rensburg694-13851/+35464
2016-08-30Merge pull request #703 from jhenahan/feature/jhenahan-keymapJack Humbert4-0/+389
2016-08-30Merge pull request #700 from algernon/h/ucis/enable-fixJack Humbert1-0/+5
2016-08-29Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne191-10220/+11500
2016-08-29Update READMEJack Henahan1-3/+9
2016-08-29jhenahan layoutJack Henahan4-0/+383
2016-08-29build_keyboard.mk: Restore UCIS_ENABLE supportGergely Nagy1-0/+5
2016-08-29Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody238-10423/+14343
2016-08-28Merge pull request #697 from fredizzimo/fix_gh_token_problemJack Humbert1-3/+3
2016-08-28Merge pull request #696 from fredizzimo/community_boardsJack Humbert1-19/+28
2016-08-28Fix the .travis.yml so that GH_TOKEN works properlyFred Sundvik1-3/+3
2016-08-27Update list of community keyboardsFred Sundvik1-19/+28
2016-08-27Merge pull request #689 from jeebak/tv44-jeebakJack Humbert4-0/+596
2016-08-27Merge pull request #684 from tomb0y/kc60_workman_deadJack Humbert2-4/+4
2016-08-27Merge pull request #695 from fredizzimo/dfu-util_instructionsJack Humbert1-5/+10
2016-08-27Merge pull request #693 from fredizzimo/infinity60Jack Humbert16-9/+37
2016-08-27Merge pull request #694 from fredizzimo/keyboard_templateJack Humbert1-5/+5
2016-08-27Merge pull request #690 from fredizzimo/unit_testJack Humbert26-724/+1007
2016-08-27Rename infinity_chibios to infinity60, and add readmeFred Sundvik16-9/+37
2016-08-27Add dfu-util to the instructionsFred Sundvik1-5/+10