Commit Graph

86 Commits

Author SHA1 Message Date
it33
0de2bd994b Changed "Theme Color Option" to "Theme Color" 2015-06-18 08:38:07 -07:00
it33
c835f2370c Update "Theme" to "Theme Color Options"
Needed to make marketing screen look nice.
2015-06-18 08:35:25 -07:00
it33
2ef445b74e Update NOTICE.txt 2015-06-18 07:05:42 -07:00
it33
69257a3b8f Update NOTICE.txt 2015-06-18 07:04:52 -07:00
it33
3efe09ab5a Update NOTICE.txt 2015-06-18 06:42:40 -07:00
Corey Hulen
3ee3cba9ff Merge pull request #25 from rgarmsen2295/mm-1064
MM-1064
2015-06-17 10:31:33 -08:00
Reed Garmsen
50c97f4155 Merge pull request #6 from rgarmsen2295/master
Remerging
2015-06-17 11:29:13 -07:00
Reed Garmsen
e142a8cb24 Fixing compatibility 2015-06-17 11:16:03 -07:00
Reed Garmsen
b7c9ceb363 Merge branch 'mm-1064' of https://github.com/rgarmsen2295/platform into mm-1064 2015-06-17 11:11:34 -07:00
Reed Garmsen
c2507f4533 Removed unnecessary comma 2015-06-17 11:11:13 -07:00
Reed Garmsen
7fbc852236 Simplified code changes 2015-06-17 11:11:13 -07:00
Reed Garmsen
1c0400a121 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
f34074a455 Merge pull request #5 from mattermost/master
to me
2015-06-17 11:09:50 -07:00
Corey Hulen
6016a98ea3 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
425402f2c4 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
7455f2621a 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
5af94ff0db Removed unnecessary comma 2015-06-17 09:54:06 -07:00
Reed Garmsen
b57796f97f Simplified code changes 2015-06-17 09:53:15 -07:00
JoramWilander
b7e516ff2e fix an auto-complete bug for mentions 2015-06-17 12:25:41 -04:00
Reed Garmsen
49e7175d00 Merge pull request #4 from rgarmsen2295/master
Sanity check
2015-06-17 09:06:13 -07:00
Christopher Speller
c3357b6088 Adding check of email configuation settings when config file is loaded 2015-06-17 11:50:51 -04:00
Reed Garmsen
8e65f38979 Merge pull request #3 from mattermost/master
to me
2015-06-17 07:54:30 -07:00
Christopher Speller
fd4b0d4aa3 Resurrecting config_docker.json. Moving docker related files to docker directory. Added copyright info. 2015-06-17 08:39:33 -04:00
=Corey Hulen
0d6ed4a6ab fixing ubild 2015-06-16 23:16:12 -08:00
=Corey Hulen
7ab95eadc9 Fixing build 2015-06-16 23:10:20 -08:00
Corey Hulen
1862f50b79 Merge pull request #17 from mattermost/fixing-build
Fixing build
2015-06-16 23:06:36 -08:00
=Corey Hulen
db2510554a Fixing build 2015-06-16 23:05:37 -08:00
=Corey Hulen
c2f6e6a10d changing port back 2015-06-16 22:54:56 -08:00
Corey Hulen
60b98340ac 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
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
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
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
Christopher Speller
76a0e0fea4 Modifications for sending local mail 2015-06-16 17:23:32 -04:00
Christopher Speller
bc7d9f5b5e Adding Dockerfile and releated configs 2015-06-16 17:23:32 -04: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
Christopher Speller
e9040749bd Allow for setting of domain with enviroment variable 2015-06-16 17:05:23 -04:00
Christopher Speller
8d3b36ed3d Fixing link 2015-06-16 16:42:14 -04:00
Christopher Speller
14b409220e Switching from config file to parsing homelink from url 2015-06-16 15:35:34 -04:00
=Corey Hulen
fdb3f15274 fixing unit test 2015-06-16 10:16:26 -08:00
=Corey Hulen
36972a68ec Merge branch 'master' of https://github.com/mattermost/platform 2015-06-16 10:15:18 -08:00
=Corey Hulen
e521bfc076 changing unit test 2015-06-16 10:15:00 -08:00
Corey Hulen
f9bd51ed5a 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
880d075bb3 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
87c4b86b17 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
5695a6a4b7 fixes mm-1218 adds sentence describing username to sign up pages 2015-06-16 12:24:51 -04:00
Reed Garmsen
9e0d4f70e0 Merge pull request #2 from mattermost/master
to me
2015-06-16 09:13:07 -07:00
it33
595a912be7 Update README.md 2015-06-16 08:40:45 -07:00
it33
78f362a520 Update README.md 2015-06-16 08:28:56 -07:00
it33
a0bbe7288e Reducing number of steps in Mattermost Setup 2015-06-16 08:24:55 -07:00
it33
3172c5f456 Update README.md 2015-06-16 07:57:54 -07:00