Commit Graph
110 Commits
Author SHA1 Message Date
Christopher Speller 07c65be91c Merge pull request #42 from mattermost/readme
Linebreaks HELIUM
2015-06-19 12:50:58 -04:00
Christopher Speller b72b25f30a Linebreaks 2015-06-19 12:49:22 -04:00
it33 76fca02e26 Update README.md 2015-06-19 07:50:39 -07:00
it33 66b06bafce Update README.md 2015-06-19 07:47:24 -07:00
Joram Wilander 4f7d30af0d Merge pull request #38 from mattermost/feedback-email-fix
Defaulting to domain of localhost when no domain is given HELIUM
2015-06-19 10:07:15 -04:00
it33 5275eaf896 Update README.md 2015-06-19 06:58:24 -07:00
Christopher Speller 23dcbb5506 Defaulting to domain of localhost when no domain is given 2015-06-19 09:52:04 -04:00
Joram Wilander 5addc9fee9 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 9420e8db19 Switching port 2015-06-19 09:23:27 -04:00
Christopher Speller ac8999eb81 Adding name and tag to commands 2015-06-19 09:21:16 -04:00
Christopher Speller 5aa42774f6 Adding linux setup instructions to readme. Adding Dockerrun.aws.json file 2015-06-19 09:01:00 -04:00
it33 96a4750ede Update README.md 2015-06-19 05:57:56 -07:00
it33 4d89dacc57 Adding "About Mattermost" to README.md 2015-06-19 05:52:31 -07:00
=Corey Hulen 316bdc6650 tweaking readme 2015-06-18 23:18:54 -08:00
Corey Hulen a4ea1c4d9c Merge pull request #35 from mattermost/readme
Updating readme
2015-06-18 23:15:35 -08:00
=Corey Hulen b603901098 Updating readme 2015-06-18 23:14:43 -08:00
Corey Hulen 98cc19c9dd Merge pull request #33 from mattermost/br-fix
HELIUM fixes br tags causing new lines
2015-06-18 23:08:01 -08:00
JoramWilander 31a265ddf5 fixes br tags causing new lines 2015-06-18 17:39:12 -04:00
Corey Hulen a1ae2abaf9 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 16d7099527 If feedback email is not specified then autodetect domain and use feedback@domain 2015-06-18 15:31:15 -04:00
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