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

104 Коммитов

Автор SHA1 Сообщение Дата
it33
ff07cd4e87 Update README.md 2015-06-19 06:58:24 -07:00
Joram Wilander
838efc0a67 Merge pull request #37 from mattermost/docker-tweaks
Adding linux setup instructions to readme. Adding Dockerrun.aws.json file. HELIUM
2015-06-19 09:34:59 -04:00
Christopher Speller
7d7602386c Switching port 2015-06-19 09:23:27 -04:00
Christopher Speller
302e56f225 Adding name and tag to commands 2015-06-19 09:21:16 -04:00
Christopher Speller
264fd965e4 Adding linux setup instructions to readme. Adding Dockerrun.aws.json file 2015-06-19 09:01:00 -04:00
it33
e953475ddd Update README.md 2015-06-19 05:57:56 -07:00
it33
1e85411a99 Adding "About Mattermost" to README.md 2015-06-19 05:52:31 -07:00
=Corey Hulen
6e9947b0ef tweaking readme 2015-06-18 23:18:54 -08:00
Corey Hulen
f95a850c9b Merge pull request #35 from mattermost/readme
Updating readme
2015-06-18 23:15:35 -08:00
=Corey Hulen
2d5df6c46e Updating readme 2015-06-18 23:14:43 -08:00
Corey Hulen
0f106e5352 Merge pull request #33 from mattermost/br-fix
HELIUM fixes br tags causing new lines
2015-06-18 23:08:01 -08:00
JoramWilander
0802c55aad fixes br tags causing new lines 2015-06-18 17:39:12 -04:00
Corey Hulen
423a862af9 Merge pull request #31 from mattermost/feedback-email-auto
HELIUM If feedback email is not specified then autodetect domain and use feedback@domain
2015-06-18 11:48:46 -08:00
Christopher Speller
2bc02d37f6 If feedback email is not specified then autodetect domain and use feedback@domain 2015-06-18 15:31:15 -04:00
Joram Wilander
471b8d40d1 Merge pull request #30 from mattermost/dockerhost
fix for dockerhost HELIUM
2015-06-18 14:59:22 -04:00
Corey Hulen
63114ad4ae 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
9c63923990 fix for dockerhost HELIUM 2015-06-18 10:55:51 -08:00
JoramWilander
7c0ce0ef96 fixes mm-1297 can now scroll through more than 5 images 2015-06-18 14:40:11 -04:00
it33
42b023a41d Changed "Theme Color Option" to "Theme Color" 2015-06-18 08:38:07 -07:00
it33
5665d348d4 Update "Theme" to "Theme Color Options"
Needed to make marketing screen look nice.
2015-06-18 08:35:25 -07:00
it33
ca6abaa9dd Update NOTICE.txt 2015-06-18 07:05:42 -07:00
it33
c97a98f7e8 Update NOTICE.txt 2015-06-18 07:04:52 -07:00
it33
e2c67d4a16 Update NOTICE.txt 2015-06-18 06:42:40 -07:00
Corey Hulen
0af539b8ef Merge pull request #25 from rgarmsen2295/mm-1064
MM-1064
2015-06-17 10:31:33 -08:00
Reed Garmsen
9c2379a711 Merge pull request #6 from rgarmsen2295/master
Remerging
2015-06-17 11:29:13 -07:00
Reed Garmsen
31d795b459 Fixing compatibility 2015-06-17 11:16:03 -07:00
Reed Garmsen
5c48d19d26 Merge branch 'mm-1064' of https://github.com/rgarmsen2295/platform into mm-1064 2015-06-17 11:11:34 -07:00
Reed Garmsen
4c44d0465b Removed unnecessary comma 2015-06-17 11:11:13 -07:00
Reed Garmsen
829f1f1808 Simplified code changes 2015-06-17 11:11:13 -07:00
Reed Garmsen
85adca9d7a 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
12f0559e28 Merge pull request #5 from mattermost/master
to me
2015-06-17 11:09:50 -07:00
Corey Hulen
876c606997 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
7eca61c2f0 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
bdde452c31 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
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