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

120 Коммитов

Автор SHA1 Сообщение Дата
Reed Garmsen
29a68da90a Removed unnecessary comma 2015-06-17 09:54:06 -07:00
Reed Garmsen
4b1d834514 Simplified code changes 2015-06-17 09:53:15 -07:00
JoramWilander
5a0389bc21 fix an auto-complete bug for mentions 2015-06-17 12:25:41 -04:00
Reed Garmsen
981822b26b Merge pull request #4 from rgarmsen2295/master
Sanity check
2015-06-17 09:06:13 -07:00
Christopher Speller
aba56724a5 Adding check of email configuation settings when config file is loaded 2015-06-17 11:50:51 -04:00
Reed Garmsen
919e98d00e Merge pull request #3 from mattermost/master
to me
2015-06-17 07:54:30 -07:00
Christopher Speller
dec6c765f5 Resurrecting config_docker.json. Moving docker related files to docker directory. Added copyright info. 2015-06-17 08:39:33 -04:00
=Corey Hulen
e7772f5dff fixing ubild 2015-06-16 23:16:12 -08:00
=Corey Hulen
3100385c59 Fixing build 2015-06-16 23:10:20 -08:00
Corey Hulen
dd2af9a821 Merge pull request #17 from mattermost/fixing-build
Fixing build
2015-06-16 23:06:36 -08:00
=Corey Hulen
0aaf806127 Fixing build 2015-06-16 23:05:37 -08:00
=Corey Hulen
69c5adcad8 changing port back 2015-06-16 22:54:56 -08:00
Corey Hulen
51454ddeb4 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
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
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
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
Christopher Speller
f116d0c93a Modifications for sending local mail 2015-06-16 17:23:32 -04:00
Christopher Speller
6bb0c65ef7 Adding Dockerfile and releated configs 2015-06-16 17:23:32 -04: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
Christopher Speller
bc8d9ac599 Allow for setting of domain with enviroment variable 2015-06-16 17:05:23 -04:00
Christopher Speller
7a20f64e74 Fixing link 2015-06-16 16:42:14 -04:00
Christopher Speller
3276b5dbd9 Switching from config file to parsing homelink from url 2015-06-16 15:35:34 -04:00
=Corey Hulen
c556bf3fba fixing unit test 2015-06-16 10:16:26 -08:00
=Corey Hulen
c1a1cbb313 Merge branch 'master' of https://github.com/mattermost/platform 2015-06-16 10:15:18 -08:00
=Corey Hulen
e314032918 changing unit test 2015-06-16 10:15:00 -08:00
Corey Hulen
07244e346b 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
a3ff4116d9 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
48a16cea64 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
3687c36b50 fixes mm-1218 adds sentence describing username to sign up pages 2015-06-16 12:24:51 -04:00
Reed Garmsen
5096e5a7b9 Merge pull request #2 from mattermost/master
to me
2015-06-16 09:13:07 -07:00
it33
594850d8e3 Update README.md 2015-06-16 08:40:45 -07:00
it33
6dd39393c4 Update README.md 2015-06-16 08:28:56 -07:00
it33
89896e69ff Reducing number of steps in Mattermost Setup 2015-06-16 08:24:55 -07:00
it33
804223c51d Update README.md 2015-06-16 07:57:54 -07:00
it33
29a25a2c83 More caveats in README.md 2015-06-16 05:22:44 -07:00
JoramWilander
e5e7b10eda fixes mm-1251 updates sign up now link 2015-06-16 07:53:58 -04:00
it33
789c52d381 Update README.md 2015-06-15 19:15:10 -07:00
it33
568ed3a8b3 Update README.md 2015-06-15 19:12:35 -07:00
it33
0b5a37a3e6 Update README.md 2015-06-15 19:11:58 -07:00
it33
d42d0e89d2 Fix typo, "ip" should be "IP" 2015-06-15 19:07:36 -07:00
it33
636f43cec4 Update README.md 2015-06-15 19:03:00 -07:00
it33
424e0a6d8f Update README.md 2015-06-15 18:59:45 -07:00
it33
143a994136 Update README.md 2015-06-15 18:56:09 -07:00
it33
0b36f7e5f3 Update README.md 2015-06-15 18:48:43 -07:00
it33
555bb6921d Update README.md
Adding preamble, taking out boiler plate instructions
2015-06-15 18:46:05 -07:00
it33
1c3c4e9fb9 Rename NOTICES.txt to NOTICE.txt 2015-06-15 17:18:39 -07:00
it33
2a2f5fb0fd Create NOTICES.txt
XXXXXX TODO: Replace sample text with references to 3rd party libraries used
2015-06-15 17:15:57 -07:00
it33
9c9a0d51f3 Update LICENSE.txt to Apache 2.0 2015-06-15 17:04:08 -07:00
Reed Garmsen
6883f691ef Merge pull request #1 from mattermost/master
to me
2015-06-15 11:22:53 -07:00
Corey Hulen
08e02c3dad Merge pull request #7 from rgarmsen2295/mm-1004
MM-1004
2015-06-15 10:20:21 -08:00