Граф коммитов

82 Коммитов

Автор SHA1 Сообщение Дата
Christopher Speller
dcc09b6991 If feedback email is not specified then autodetect domain and use feedback@domain 2015-06-18 15:31:15 -04:00
Corey Hulen
11e7b56e78 Merge pull request #25 from rgarmsen2295/mm-1064
MM-1064
2015-06-17 10:31:33 -08:00
Reed Garmsen
bf3ca45dac Merge pull request #6 from rgarmsen2295/master
Remerging
2015-06-17 11:29:13 -07:00
Reed Garmsen
2a427254f4 Fixing compatibility 2015-06-17 11:16:03 -07:00
Reed Garmsen
70d4d3f3b2 Merge branch 'mm-1064' of https://github.com/rgarmsen2295/platform into mm-1064 2015-06-17 11:11:34 -07:00
Reed Garmsen
806eb40f5f Removed unnecessary comma 2015-06-17 11:11:13 -07:00
Reed Garmsen
519bebcaee Simplified code changes 2015-06-17 11:11:13 -07:00
Reed Garmsen
f74ced758f Added in basic changes necessary to fix some typos. Needs further tests and changes to other config files 2015-06-17 11:11:13 -07:00
Reed Garmsen
f99ad06c19 Merge pull request #5 from mattermost/master
to me
2015-06-17 11:09:50 -07:00
Corey Hulen
8265b32b8b Merge pull request #22 from mattermost/mention-fix
fix an auto-complete bug for mentions MERGE FOR HELIUM RELEASE
2015-06-17 10:04:47 -08:00
Corey Hulen
1d9400f18c Merge pull request #21 from mattermost/mm-1225
MM-1225 Adding check of email configuation settings when config file is loaded
2015-06-17 10:04:29 -08:00
Corey Hulen
e89d12fc8c Merge pull request #20 from mattermost/docker-tweaks
MM-1157 Various tweaks to docker requested. HELIUM
2015-06-17 10:02:29 -08:00
Reed Garmsen
3d1975dea4 Removed unnecessary comma 2015-06-17 09:54:06 -07:00
Reed Garmsen
bf1e35bc19 Simplified code changes 2015-06-17 09:53:15 -07:00
JoramWilander
20ead3585d fix an auto-complete bug for mentions 2015-06-17 12:25:41 -04:00
Reed Garmsen
fabc409a62 Merge pull request #4 from rgarmsen2295/master
Sanity check
2015-06-17 09:06:13 -07:00
Christopher Speller
6eb3775956 Adding check of email configuation settings when config file is loaded 2015-06-17 11:50:51 -04:00
Reed Garmsen
cafbada514 Merge pull request #3 from mattermost/master
to me
2015-06-17 07:54:30 -07:00
Christopher Speller
8789b11103 Resurrecting config_docker.json. Moving docker related files to docker directory. Added copyright info. 2015-06-17 08:39:33 -04:00
=Corey Hulen
5a8f839716 fixing ubild 2015-06-16 23:16:12 -08:00
=Corey Hulen
a3de48555a Fixing build 2015-06-16 23:10:20 -08:00
Corey Hulen
6d40ac91bd Merge pull request #17 from mattermost/fixing-build
Fixing build
2015-06-16 23:06:36 -08:00
=Corey Hulen
b41925da31 Fixing build 2015-06-16 23:05:37 -08:00
=Corey Hulen
7d14343634 changing port back 2015-06-16 22:54:56 -08:00
Corey Hulen
087de8e3c5 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
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
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
Christopher Speller
43a35119d4 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
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
Christopher Speller
2f2aded178 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
eedced16c3 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
2bf5a14118 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
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
Corey Hulen
02e3969b17 Merge pull request #11 from mattermost/mm-1228
MM-1228 - Ability to use local mail config.
2015-06-16 09:58:53 -08:00
Corey Hulen
f251b1243e Merge pull request #10 from mattermost/mm-1251
fixes mm-1251 updates sign up now link
2015-06-16 09:29:36 -08:00
JoramWilander
4330537303 fixes mm-1218 adds sentence describing username to sign up pages 2015-06-16 12:24:51 -04:00
Reed Garmsen
a7ed61ef90 Merge pull request #2 from mattermost/master
to me
2015-06-16 09:13:07 -07:00
it33
347333c6a4 Update README.md 2015-06-16 08:40:45 -07:00
it33
8136b62f86 Update README.md 2015-06-16 08:28:56 -07:00
it33
332c3a0fd1 Reducing number of steps in Mattermost Setup 2015-06-16 08:24:55 -07:00
it33
9c660eb6b9 Update README.md 2015-06-16 07:57:54 -07:00
it33
0821b51f4e More caveats in README.md 2015-06-16 05:22:44 -07:00
JoramWilander
0655c8798f fixes mm-1251 updates sign up now link 2015-06-16 07:53:58 -04:00
it33
b59716edcd Update README.md 2015-06-15 19:15:10 -07:00
it33
fc9061268e Update README.md 2015-06-15 19:12:35 -07:00