Joram Wilander
|
bfdd467a3a
|
Merge pull request #30 from mattermost/dockerhost
fix for dockerhost HELIUM
|
2015-06-18 14:59:22 -04:00 |
|
Corey Hulen
|
bcea40686a
|
Merge pull request #29 from mattermost/mm-1297
FOR HELIUM RELEASE fixes mm-1297 can now scroll through more than 5 images
|
2015-06-18 10:58:37 -08:00 |
|
=Corey Hulen
|
dbd781c018
|
fix for dockerhost HELIUM
|
2015-06-18 10:55:51 -08:00 |
|
JoramWilander
|
19ec09391c
|
fixes mm-1297 can now scroll through more than 5 images
|
2015-06-18 14:40:11 -04:00 |
|
it33
|
27c29ed745
|
Changed "Theme Color Option" to "Theme Color"
|
2015-06-18 08:38:07 -07:00 |
|
it33
|
0837962c67
|
Update "Theme" to "Theme Color Options"
Needed to make marketing screen look nice.
|
2015-06-18 08:35:25 -07:00 |
|
it33
|
ea46c8b6a5
|
Update NOTICE.txt
|
2015-06-18 07:05:42 -07:00 |
|
it33
|
ee0ea29d01
|
Update NOTICE.txt
|
2015-06-18 07:04:52 -07:00 |
|
it33
|
c5b32c8a6b
|
Update NOTICE.txt
|
2015-06-18 06:42:40 -07:00 |
|
Corey Hulen
|
6bc2382693
|
Merge pull request #25 from rgarmsen2295/mm-1064
MM-1064
|
2015-06-17 10:31:33 -08:00 |
|
Reed Garmsen
|
e7f4a7b5ab
|
Merge pull request #6 from rgarmsen2295/master
Remerging
|
2015-06-17 11:29:13 -07:00 |
|
Reed Garmsen
|
d8ebad2658
|
Fixing compatibility
|
2015-06-17 11:16:03 -07:00 |
|
Reed Garmsen
|
2012070a95
|
Merge branch 'mm-1064' of https://github.com/rgarmsen2295/platform into mm-1064
|
2015-06-17 11:11:34 -07:00 |
|
Reed Garmsen
|
19c6270695
|
Removed unnecessary comma
|
2015-06-17 11:11:13 -07:00 |
|
Reed Garmsen
|
bf69f66878
|
Simplified code changes
|
2015-06-17 11:11:13 -07:00 |
|
Reed Garmsen
|
533d3ca512
|
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
|
79f59bbade
|
Merge pull request #5 from mattermost/master
to me
|
2015-06-17 11:09:50 -07:00 |
|
Corey Hulen
|
fad1069649
|
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
|
fbf60e109a
|
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
|
0ba5e0e403
|
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
|
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 |
|
JoramWilander
|
46ee3018d6
|
fix an auto-complete bug for mentions
|
2015-06-17 12:25:41 -04:00 |
|
Reed Garmsen
|
75d2f4082d
|
Merge pull request #4 from rgarmsen2295/master
Sanity check
|
2015-06-17 09:06:13 -07:00 |
|
Christopher Speller
|
7b14927cf9
|
Adding check of email configuation settings when config file is loaded
|
2015-06-17 11:50:51 -04:00 |
|
Reed Garmsen
|
2ec91fa5e6
|
Merge pull request #3 from mattermost/master
to me
|
2015-06-17 07:54:30 -07:00 |
|
Christopher Speller
|
45f166cc56
|
Resurrecting config_docker.json. Moving docker related files to docker directory. Added copyright info.
|
2015-06-17 08:39:33 -04: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 |
|