summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #22 from mattermost/mention-fixCorey Hulen2015-06-171-1/+1
|\ | | | | fix an auto-complete bug for mentions MERGE FOR HELIUM RELEASE
| * fix an auto-complete bug for mentionsJoramWilander2015-06-171-1/+1
| |
* | Merge pull request #21 from mattermost/mm-1225Corey Hulen2015-06-172-32/+71
|\ \ | | | | | | MM-1225 Adding check of email configuation settings when config file is loaded
| * | 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
|\ \ | |/ |/| MM-1157 Various tweaks to docker requested. HELIUM
| * Resurrecting config_docker.json. Moving docker related files to docker ↵Christopher Speller2015-06-176-22/+96
|/ | | | directory. Added copyright info.
* 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
| * 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
|\ | | | | MM-1157 Docker file and related configurations
| * Using config.json instead of config_docker.json for docker. Note, this will ↵Christopher Speller2015-06-163-91/+10
| | | | | | | | break local dev builds.
| * 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 variable
| * 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
|\ \ | |/ |/| MM-1294 - Parsing homelink from URL instead of using config setting.
| * 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 pages
| | * 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
|\ \ | | | | | | MM-1228 - Ability to use local mail config.
| * | Modifying sendmail to allow for non-encrypted connection for ease setup of ↵Christopher Speller2015-06-153-8/+21
| | | | | | | | | | | | local mail sender
* | | Merge pull request #10 from mattermost/mm-1251Corey Hulen2015-06-161-1/+1
|\ \ \ | |_|/ |/| | fixes mm-1251 updates sign up now link
| * | fixes mm-1251 updates sign up now linkJoramWilander2015-06-161-1/+1
| | |
* | | Update README.mdit332015-06-160-0/+0
| | |
* | | Update README.mdit332015-06-160-0/+0
| | |
* | | Reducing number of steps in Mattermost Setupit332015-06-160-0/+0
| | |
* | | Update README.mdit332015-06-160-0/+0
| | |
* | | More caveats in README.mdit332015-06-160-0/+0
|/ /
* | Update README.mdit332015-06-150-0/+0
| |
* | Update README.mdit332015-06-150-0/+0
| |
* | Update README.mdit332015-06-150-0/+0
| |
* | Fix typo, "ip" should be "IP"it332015-06-150-0/+0
| |
* | Update README.mdit332015-06-150-0/+0
| |
* | Update README.mdit332015-06-150-0/+0
| |
* | Update README.mdit332015-06-150-0/+0
| |
* | Update README.mdit332015-06-150-0/+0
| |
* | Update README.mdit332015-06-150-0/+0
| | | | | | Adding preamble, taking out boiler plate instructions
* | Rename NOTICES.txt to NOTICE.txtit332015-06-151-0/+0
| |
* | Create NOTICES.txtit332015-06-151-0/+4
| | | | | | XXXXXX TODO: Replace sample text with references to 3rd party libraries used
* | Update LICENSE.txt to Apache 2.0it332015-06-151-5/+0
| |
* | Merge pull request #7 from rgarmsen2295/mm-1004Corey Hulen2015-06-152-3/+6
|\ \ | | | | | | MM-1004
| * | Error messages revolving around comment creation appear clientside unless we ↵Reed Garmsen2015-06-151-0/+6
| | | | | | | | | | | | have a better solution in place
| * | Invalid RootId parameter error message no longer displays on the client. ↵Reed Garmsen2015-06-152-4/+1
| |/ | | | | | | Changed acceptance of error from Agree to Okay.
* | Merge pull request #6 from rgarmsen2295/mm-1066Corey Hulen2015-06-151-1/+1
|\ \ | | | | | | MM-1066