Reed Garmsen
|
2a427254f4
|
Fixing compatibility
|
2015-06-17 11:16:03 -07:00 |
|
Reed Garmsen
|
d8ebad2658
|
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
|
2012070a95
|
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
|
19c6270695
|
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
|
bf69f66878
|
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
|
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
|
f99ad06c19
|
Merge pull request #5 from mattermost/master
to me
|
2015-06-17 11:09:50 -07:00 |
|
Reed Garmsen
|
79f59bbade
|
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
|
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
|
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
|
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
|
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 |
|
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
|
3d1975dea4
|
Removed unnecessary comma
|
2015-06-17 09:54:06 -07:00 |
|
Reed Garmsen
|
7bd2c10e0a
|
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 |
|
Reed Garmsen
|
133c4d8de1
|
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 |
|
JoramWilander
|
46ee3018d6
|
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 |
|
Reed Garmsen
|
75d2f4082d
|
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 |
|
Christopher Speller
|
7b14927cf9
|
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 |
|
Reed Garmsen
|
2ec91fa5e6
|
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 |
|
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
|
5a8f839716
|
fixing ubild
|
2015-06-16 23:16:12 -08:00 |
|
=Corey Hulen
|
a1c1ab4d00
|
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
|
bbd5c1425a
|
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
|
8aa62a5b6c
|
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
|
4cfa1da8b4
|
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
|
c9bd02cea5
|
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 |
|
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
|
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 |
|
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
|
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 |
|
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
|
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 |
|
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 |
|