diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-07-28 13:52:31 -0400 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2017-07-28 11:52:31 -0600 |
| commit | 3c0f082506a68240abd1960cbd0fda22679e12c2 (patch) | |
| tree | 395a1e9ecdb1eb2c6d7bf7141e3364cc043d9edd /config | |
| parent | da6e6ca0bf3f880b60de8d809a7588dfbec3a77a (diff) | |
| download | chat-3c0f082506a68240abd1960cbd0fda22679e12c2.tar.gz chat-3c0f082506a68240abd1960cbd0fda22679e12c2.tar.bz2 chat-3c0f082506a68240abd1960cbd0fda22679e12c2.zip | |
PLT-6924 Added config options to disable file uploads/downloads on mobile (#7049)
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.json | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/config/config.json b/config/config.json index 35747cefd..0c7144f1a 100644 --- a/config/config.json +++ b/config/config.json @@ -46,18 +46,10 @@ "TimeBetweenUserTypingUpdatesMilliseconds": 5000, "EnablePostSearch": true, "EnableUserTypingMessages": true, - "EnableUserStatuses": true, "EnableChannelViewedMessages": true, + "EnableUserStatuses": true, "ClusterLogTimeoutMilliseconds": 2000 }, - "ElasticsearchSettings": { - "ConnectionUrl": "http://dockerhost:9200", - "Username": "elastic", - "Password": "changeme", - "EnableIndexing": false, - "EnableSearching": false, - "Sniff": true - }, "TeamSettings": { "SiteName": "Mattermost", "MaxUsersPerTeam": 50, @@ -112,6 +104,8 @@ }, "FileSettings": { "EnableFileAttachments": true, + "EnableMobileUpload": true, + "EnableMobileDownload": true, "MaxFileSize": 52428800, "DriverName": "local", "Directory": "./data/", @@ -167,6 +161,9 @@ "AboutLink": "https://about.mattermost.com/default-about/", "HelpLink": "https://about.mattermost.com/default-help/", "ReportAProblemLink": "https://about.mattermost.com/default-report-a-problem/", + "AdministratorsGuideLink": "https://about.mattermost.com/administrators-guide/", + "TroubleshootingForumLink": "https://about.mattermost.com/troubleshooting-forum/", + "CommercialSupportLink": "https://about.mattermost.com/commercial-support/", "SupportEmail": "feedback@mattermost.com" }, "AnnouncementSettings": { @@ -287,6 +284,14 @@ "TurnUsername": "", "TurnSharedKey": "" }, + "ElasticsearchSettings": { + "ConnectionUrl": "http://dockerhost:9200", + "Username": "elastic", + "Password": "changeme", + "EnableIndexing": false, + "EnableSearching": false, + "Sniff": true + }, "DataRetentionSettings": { "Enable": false }, @@ -294,4 +299,4 @@ "RunJobs": true, "RunScheduler": true } -} +}
\ No newline at end of file |