Commit Graph

18289 Commits

Author SHA1 Message Date
Corey Hulen
e9306fb917 Merge pull request #16 from mattermost/mm-1157
MM-1157 Docker file and related configurations
2015-06-16 22:50:07 -08:00
Reed Garmsen
988d5371d5 Added in basic changes necessary to fix some typos. Needs further tests and changes to other config files 2015-06-16 17:08:06 -07:00
Reed Garmsen
42e85f7aa9 Added in basic changes necessary to fix some typos. Needs further tests and changes to other config files 2015-06-16 17:08:06 -07:00
Reed Garmsen
7106748412 Added in basic changes necessary to fix some typos. Needs further tests and changes to other config files 2015-06-16 17:08:06 -07:00
Reed Garmsen
2f7ffe1e7e Added in basic changes necessary to fix some typos. Needs further tests and changes to other config files 2015-06-16 17:08:06 -07:00
Christopher Speller
e022e87b66 Using config.json instead of config_docker.json for docker. Note, this will break local dev builds. 2015-06-16 19:46:56 -04:00
Christopher Speller
240590aef8 Using config.json instead of config_docker.json for docker. Note, this will break local dev builds. 2015-06-16 19:46:56 -04:00
Christopher Speller
4cd28a520c Using config.json instead of config_docker.json for docker. Note, this will break local dev builds. 2015-06-16 19:46:56 -04:00
Christopher Speller
00f709b3f8 Using config.json instead of config_docker.json for docker. Note, this will break local dev builds. 2015-06-16 19:46:56 -04:00
Corey Hulen
521cb015c4 Merge pull request #15 from mattermost/enviroment-override
Allow for setting of domain with enviroment variable
2015-06-16 13:50:22 -08:00
Corey Hulen
eec8c349e3 Merge pull request #15 from mattermost/enviroment-override
Allow for setting of domain with enviroment variable
2015-06-16 13:50:22 -08:00
Corey Hulen
be61bfe0e9 Merge pull request #15 from mattermost/enviroment-override
Allow for setting of domain with enviroment variable
2015-06-16 13:50:22 -08:00
Corey Hulen
89cedbcce2 Merge pull request #15 from mattermost/enviroment-override
Allow for setting of domain with enviroment variable
2015-06-16 13:50:22 -08:00
Christopher Speller
43a35119d4 Modifications for sending local mail 2015-06-16 17:23:32 -04:00
Christopher Speller
f116d0c93a Modifications for sending local mail 2015-06-16 17:23:32 -04:00
Christopher Speller
76a0e0fea4 Modifications for sending local mail 2015-06-16 17:23:32 -04:00
Christopher Speller
d2926d316d Modifications for sending local mail 2015-06-16 17:23:32 -04:00
Christopher Speller
5c5b7d9738 Adding Dockerfile and releated configs 2015-06-16 17:23:32 -04:00
Christopher Speller
6bb0c65ef7 Adding Dockerfile and releated configs 2015-06-16 17:23:32 -04:00
Christopher Speller
bc7d9f5b5e Adding Dockerfile and releated configs 2015-06-16 17:23:32 -04:00
Christopher Speller
aaa09f11f1 Adding Dockerfile and releated configs 2015-06-16 17:23:32 -04:00
Corey Hulen
f937fa0d9c Merge pull request #14 from mattermost/mm-1294
MM-1294 - Parsing homelink from URL instead of using config setting.
2015-06-16 13:18:41 -08:00
Corey Hulen
64caa7453f Merge pull request #14 from mattermost/mm-1294
MM-1294 - Parsing homelink from URL instead of using config setting.
2015-06-16 13:18:41 -08:00
Corey Hulen
6315af920a Merge pull request #14 from mattermost/mm-1294
MM-1294 - Parsing homelink from URL instead of using config setting.
2015-06-16 13:18:41 -08:00
Corey Hulen
aba9294908 Merge pull request #14 from mattermost/mm-1294
MM-1294 - Parsing homelink from URL instead of using config setting.
2015-06-16 13:18:41 -08:00
Christopher Speller
2f2aded178 Allow for setting of domain with enviroment variable 2015-06-16 17:05:23 -04:00
Christopher Speller
bc8d9ac599 Allow for setting of domain with enviroment variable 2015-06-16 17:05:23 -04:00
Christopher Speller
e9040749bd Allow for setting of domain with enviroment variable 2015-06-16 17:05:23 -04:00
Christopher Speller
d4c7e8e265 Allow for setting of domain with enviroment variable 2015-06-16 17:05:23 -04:00
Christopher Speller
d927e2ba69 Fixing link 2015-06-16 16:42:14 -04:00
Christopher Speller
7a20f64e74 Fixing link 2015-06-16 16:42:14 -04:00
Christopher Speller
8d3b36ed3d Fixing link 2015-06-16 16:42:14 -04:00
Christopher Speller
3860daaa42 Fixing link 2015-06-16 16:42:14 -04:00
Christopher Speller
eedced16c3 Switching from config file to parsing homelink from url 2015-06-16 15:35:34 -04:00
Christopher Speller
3276b5dbd9 Switching from config file to parsing homelink from url 2015-06-16 15:35:34 -04:00
Christopher Speller
14b409220e Switching from config file to parsing homelink from url 2015-06-16 15:35:34 -04:00
Christopher Speller
2b5fb34c32 Switching from config file to parsing homelink from url 2015-06-16 15:35:34 -04:00
=Corey Hulen
dae0340d7d fixing unit test 2015-06-16 10:16:26 -08:00
=Corey Hulen
c556bf3fba fixing unit test 2015-06-16 10:16:26 -08:00
=Corey Hulen
fdb3f15274 fixing unit test 2015-06-16 10:16:26 -08:00
=Corey Hulen
7b49194d9e fixing unit test 2015-06-16 10:16:26 -08:00
=Corey Hulen
2bf5a14118 Merge branch 'master' of https://github.com/mattermost/platform 2015-06-16 10:15:18 -08:00
=Corey Hulen
c1a1cbb313 Merge branch 'master' of https://github.com/mattermost/platform 2015-06-16 10:15:18 -08:00
=Corey Hulen
36972a68ec Merge branch 'master' of https://github.com/mattermost/platform 2015-06-16 10:15:18 -08:00
=Corey Hulen
22f1b86d54 Merge branch 'master' of https://github.com/mattermost/platform 2015-06-16 10:15:18 -08:00
=Corey Hulen
aa9992671e changing unit test 2015-06-16 10:15:00 -08:00
=Corey Hulen
e314032918 changing unit test 2015-06-16 10:15:00 -08:00
=Corey Hulen
e521bfc076 changing unit test 2015-06-16 10:15:00 -08:00
=Corey Hulen
b346522311 changing unit test 2015-06-16 10:15:00 -08:00
Corey Hulen
225275680e Merge pull request #12 from mattermost/mm-1285
fixes mm-1218 adds sentence describing username to sign up pages
2015-06-16 10:05:59 -08:00