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

67 Коммитов

Автор SHA1 Сообщение Дата
Reed Garmsen
7bd2c10e0a Removed unnecessary comma 2015-06-17 09:54:06 -07:00
Reed Garmsen
133c4d8de1 Simplified code changes 2015-06-17 09:53:15 -07:00
Reed Garmsen
75d2f4082d Merge pull request #4 from rgarmsen2295/master
Sanity check
2015-06-17 09:06:13 -07:00
Reed Garmsen
2ec91fa5e6 Merge pull request #3 from mattermost/master
to me
2015-06-17 07:54:30 -07:00
=Corey Hulen
a1c1ab4d00 fixing ubild 2015-06-16 23:16:12 -08:00
=Corey Hulen
bbd5c1425a Fixing build 2015-06-16 23:10:20 -08:00
Corey Hulen
8aa62a5b6c Merge pull request #17 from mattermost/fixing-build
Fixing build
2015-06-16 23:06:36 -08:00
=Corey Hulen
4cfa1da8b4 Fixing build 2015-06-16 23:05:37 -08:00
=Corey Hulen
c9bd02cea5 changing port back 2015-06-16 22:54:56 -08:00
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
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
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
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
d2926d316d Modifications for sending local mail 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
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
d4c7e8e265 Allow for setting of domain with enviroment variable 2015-06-16 17:05:23 -04:00
Christopher Speller
3860daaa42 Fixing link 2015-06-16 16:42:14 -04:00
Christopher Speller
2b5fb34c32 Switching from config file to parsing homelink from url 2015-06-16 15:35:34 -04:00
=Corey Hulen
7b49194d9e fixing unit test 2015-06-16 10:16:26 -08:00
=Corey Hulen
22f1b86d54 Merge branch 'master' of https://github.com/mattermost/platform 2015-06-16 10:15:18 -08:00
=Corey Hulen
b346522311 changing unit test 2015-06-16 10:15:00 -08:00
Corey Hulen
fdf1123dde 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
2e75610668 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
6f1f705abe 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
09dd29c77c fixes mm-1218 adds sentence describing username to sign up pages 2015-06-16 12:24:51 -04:00
Reed Garmsen
faec89b291 Merge pull request #2 from mattermost/master
to me
2015-06-16 09:13:07 -07:00
it33
4b478f55c2 Update README.md 2015-06-16 08:40:45 -07:00
it33
d8049860b4 Update README.md 2015-06-16 08:28:56 -07:00
it33
e8fc27b248 Reducing number of steps in Mattermost Setup 2015-06-16 08:24:55 -07:00
it33
96179f5867 Update README.md 2015-06-16 07:57:54 -07:00
it33
50a968927f More caveats in README.md 2015-06-16 05:22:44 -07:00
JoramWilander
71c810076c fixes mm-1251 updates sign up now link 2015-06-16 07:53:58 -04:00
it33
f162fb1267 Update README.md 2015-06-15 19:15:10 -07:00
it33
5fc8a175a3 Update README.md 2015-06-15 19:12:35 -07:00
it33
7bfed52464 Update README.md 2015-06-15 19:11:58 -07:00
it33
1365c52597 Fix typo, "ip" should be "IP" 2015-06-15 19:07:36 -07:00
it33
5ac1fbe085 Update README.md 2015-06-15 19:03:00 -07:00
it33
7bfccca5c5 Update README.md 2015-06-15 18:59:45 -07:00
it33
a4a125d1d0 Update README.md 2015-06-15 18:56:09 -07:00
it33
0247f158a7 Update README.md 2015-06-15 18:48:43 -07:00
it33
7cb2bf8d80 Update README.md
Adding preamble, taking out boiler plate instructions
2015-06-15 18:46:05 -07:00
it33
4662ce929c Rename NOTICES.txt to NOTICE.txt 2015-06-15 17:18:39 -07:00
it33
53072256cf Create NOTICES.txt
XXXXXX TODO: Replace sample text with references to 3rd party libraries used
2015-06-15 17:15:57 -07:00
it33
3dbffe3492 Update LICENSE.txt to Apache 2.0 2015-06-15 17:04:08 -07:00
Reed Garmsen
0cd93cf2da Merge pull request #1 from mattermost/master
to me
2015-06-15 11:22:53 -07:00
Corey Hulen
6f10c401a4 Merge pull request #7 from rgarmsen2295/mm-1004
MM-1004
2015-06-15 10:20:21 -08:00
Reed Garmsen
2048b9567f Error messages revolving around comment creation appear clientside unless we have a better solution in place 2015-06-15 11:09:57 -07:00
Corey Hulen
21a868728a Merge pull request #6 from rgarmsen2295/mm-1066
MM-1066
2015-06-15 10:03:10 -08:00
Corey Hulen
916df98252 Merge pull request #4 from mattermost/mm-1245
fixes mm-1245 filenames are now url escaped
2015-06-15 10:02:11 -08:00