summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* MM-1253 - Fixing new message and date separator corner caseAsaad Mahmood2015-06-282-38/+52
* Merge pull request #1 from rgarmsen2295/mm-1253asaadmahmoodspin2015-06-1918-62/+489
|\
| * Removed extraneous post control from within new message separatorReed Garmsen2015-06-181-3/+1
| * Merge pull request #9 from rgarmsen2295/masterReed Garmsen2015-06-1816-35/+469
| |\
| | * Merge pull request #8 from mattermost/masterReed Garmsen2015-06-181-2/+9
| | |\
| | | * Update NOTICE.txtit332015-06-181-0/+2
| | | * Update NOTICE.txtit332015-06-181-1/+1
| | | * Update NOTICE.txtit332015-06-181-1/+6
| | * | Merge pull request #7 from mattermost/masterReed Garmsen2015-06-172-4/+4
| | |\|
| | | * Merge pull request #25 from rgarmsen2295/mm-1064Corey Hulen2015-06-172-4/+4
| | | |\
| | | | * Merge pull request #6 from rgarmsen2295/masterReed Garmsen2015-06-179-54/+167
| | | | |\ | | | |_|/ | | |/| |
| | * | | Merge pull request #5 from mattermost/masterReed Garmsen2015-06-179-55/+168
| | |\| |
| | | * | Merge pull request #22 from mattermost/mention-fixCorey Hulen2015-06-171-1/+1
| | | |\ \
| | | | * | fix an auto-complete bug for mentionsJoramWilander2015-06-171-1/+1
| | | * | | Merge pull request #21 from mattermost/mm-1225Corey Hulen2015-06-172-32/+71
| | | |\ \ \
| | | | * | | Adding check of email configuation settings when config file is loadedChristopher Speller2015-06-172-32/+71
| | | | |/ /
| | | * | | Merge pull request #20 from mattermost/docker-tweaksCorey Hulen2015-06-176-22/+96
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Resurrecting config_docker.json. Moving docker related files to docker direct...Christopher Speller2015-06-176-22/+96
| | | |/ /
| | | | * Fixing compatibilityReed Garmsen2015-06-171-0/+1
| | | | * Merge branch 'mm-1064' of https://github.com/rgarmsen2295/platform into mm-1064Reed Garmsen2015-06-170-0/+0
| | | | |\
| | | | | * Removed unnecessary commaReed Garmsen2015-06-171-1/+1
| | | | | * Simplified code changesReed Garmsen2015-06-173-5/+2
| | | | | * Merge pull request #4 from rgarmsen2295/masterReed Garmsen2015-06-1713-17/+331
| | | | | |\ | | | |_|_|/ | | |/| | |
| | | | | * Added in basic changes necessary to fix some typos. Needs further tests and ...Reed Garmsen2015-06-162-5/+7
| | | | * | Removed unnecessary commaReed Garmsen2015-06-171-1/+1
| | | | * | Simplified code changesReed Garmsen2015-06-173-5/+2
| | | | * | Added in basic changes necessary to fix some typos. Needs further tests and ...Reed Garmsen2015-06-172-5/+7
| | | |/ / | | |/| |
| | * | | Merge pull request #3 from mattermost/masterReed Garmsen2015-06-1713-17/+331
| | |\| | | | | |/ | | |/|
| | | * fixing ubild=Corey Hulen2015-06-161-1/+1
| | | * Fixing build=Corey Hulen2015-06-161-0/+2
| | | * Merge pull request #17 from mattermost/fixing-buildCorey Hulen2015-06-162-7/+11
| | | |\
| | | | * Fixing build=Corey Hulen2015-06-162-7/+11
| | | |/
| | | * changing port back=Corey Hulen2015-06-161-1/+1
| | | * Merge pull request #16 from mattermost/mm-1157Corey Hulen2015-06-164-6/+264
| | | |\
| | | | * Using config.json instead of config_docker.json for docker. Note, this will b...Christopher Speller2015-06-163-91/+10
| | | | * Modifications for sending local mailChristopher Speller2015-06-164-4/+54
| | | | * Adding Dockerfile and releated configsChristopher Speller2015-06-163-0/+289
| | | * | Merge pull request #15 from mattermost/enviroment-overrideCorey Hulen2015-06-162-0/+20
| | | |\ \ | | | | |/ | | | |/|
| | | | * Allow for setting of domain with enviroment variableChristopher Speller2015-06-162-0/+20
| | | * | Merge pull request #14 from mattermost/mm-1294Corey Hulen2015-06-163-3/+15
| | | |\ \ | | | | |/ | | | |/|
| | | | * Fixing linkChristopher Speller2015-06-161-2/+2
| | | | * Switching from config file to parsing homelink from urlChristopher Speller2015-06-163-3/+15
| | | |/
| | | * fixing unit test=Corey Hulen2015-06-161-1/+1
| | | * Merge branch 'master' of https://github.com/mattermost/platform=Corey Hulen2015-06-162-1/+3
| | | |\
| | | | * Merge pull request #12 from mattermost/mm-1285Corey Hulen2015-06-162-1/+3
| | | | |\
| | | | | * fixes mm-1218 adds sentence describing username to sign up pagesJoramWilander2015-06-162-1/+3
| | | * | | changing unit test=Corey Hulen2015-06-161-1/+4
| | | |/ /
| | | * | Merge pull request #11 from mattermost/mm-1228Corey Hulen2015-06-163-8/+21
| | | |\ \
| | | | * | Modifying sendmail to allow for non-encrypted connection for ease setup of lo...Christopher Speller2015-06-153-8/+21
| | | * | | Merge pull request #10 from mattermost/mm-1251Corey Hulen2015-06-161-1/+1
| | | |\ \ \ | | | | |_|/ | | | |/| |