summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #31 from mattermost/feedback-email-autoCorey Hulen2015-06-182-4/+10
|\ | | | | HELIUM If feedback email is not specified then autodetect domain and use feedback@domain
| * If feedback email is not specified then autodetect domain and use ↵Christopher Speller2015-06-182-4/+10
| | | | | | | | feedback@domain
* | Merge pull request #30 from mattermost/dockerhostJoram Wilander2015-06-185-4/+19
|\ \ | | | | | | fix for dockerhost HELIUM
| * | fix for dockerhost HELIUM=Corey Hulen2015-06-185-4/+19
| | |
* | | Merge pull request #29 from mattermost/mm-1297Corey Hulen2015-06-181-7/+9
|\ \ \ | |/ / |/| | FOR HELIUM RELEASE fixes mm-1297 can now scroll through more than 5 images
| * | fixes mm-1297 can now scroll through more than 5 imagesJoramWilander2015-06-181-7/+9
|/ /
* | Changed "Theme Color Option" to "Theme Color"it332015-06-181-2/+2
| |
* | Update "Theme" to "Theme Color Options" it332015-06-181-2/+2
| | | | | | Needed to make marketing screen look nice.
* | Update NOTICE.txtit332015-06-181-0/+2
| |
* | Update NOTICE.txtit332015-06-181-1/+1
| |
* | Update NOTICE.txtit332015-06-181-1/+6
|/
* Merge pull request #25 from rgarmsen2295/mm-1064Corey Hulen2015-06-172-4/+4
|\ | | | | MM-1064
| * Merge pull request #6 from rgarmsen2295/masterReed Garmsen2015-06-179-54/+167
| |\ | | | | | | Remerging
| | * Merge pull request #5 from mattermost/masterReed Garmsen2015-06-179-55/+168
| | |\ | |_|/ |/| | to me
* | | 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 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
| | |\| | | | | | | | | Sanity check
| | * | Added in basic changes necessary to fix some typos. Needs further tests and ↵Reed Garmsen2015-06-162-5/+7
| | | | | | | | | | | | | | | | changes to other config files
| * | | 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
| | |/ | |/| | | | | | | changes to other config files
| * | Merge pull request #3 from mattermost/masterReed Garmsen2015-06-1713-17/+331
| |\ \ | |/ / |/| / | |/ to me
* | 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.
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-08 06:08:49 +0000