summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* update unit tests for new createProfileImage funcJoramWilander2015-06-191-4/+11
|
* profile image now generates on each call if S3 is not configuredJoramWilander2015-06-191-31/+37
|
* Merge pull request #38 from mattermost/feedback-email-fixJoram Wilander2015-06-191-0/+4
|\ | | | | Defaulting to domain of localhost when no domain is given HELIUM
| * Defaulting to domain of localhost when no domain is givenChristopher Speller2015-06-191-0/+4
| |
* | Update README.mdit332015-06-191-6/+7
| |
* | Merge pull request #37 from mattermost/docker-tweaksJoram Wilander2015-06-192-3/+43
|\ \ | |/ |/| Adding linux setup instructions to readme. Adding Dockerrun.aws.json file. HELIUM
| * Switching portChristopher Speller2015-06-191-4/+4
| |
| * Adding name and tag to commandsChristopher Speller2015-06-191-2/+2
| |
| * Adding linux setup instructions to readme. Adding Dockerrun.aws.json fileChristopher Speller2015-06-192-3/+43
|/
* Update README.mdit332015-06-191-1/+1
|
* Adding "About Mattermost" to README.mdit332015-06-191-2/+8
|
* tweaking readme=Corey Hulen2015-06-181-32/+33
|
* Merge pull request #35 from mattermost/readmeCorey Hulen2015-06-182-42/+97
|\ | | | | Updating readme
| * Updating readme=Corey Hulen2015-06-182-42/+97
|/
* Merge pull request #33 from mattermost/br-fixCorey Hulen2015-06-182-7/+2
|\ | | | | HELIUM fixes br tags causing new lines
| * fixes br tags causing new linesJoramWilander2015-06-182-7/+2
|/
* 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
|/ /