diff options
Diffstat (limited to 'doc/install')
-rw-r--r-- | doc/install/Configuration-Settings.md | 22 | ||||
-rw-r--r-- | doc/install/Requirements.md | 6 |
2 files changed, 12 insertions, 16 deletions
diff --git a/doc/install/Configuration-Settings.md b/doc/install/Configuration-Settings.md index 66fda15e0..46a6defdf 100644 --- a/doc/install/Configuration-Settings.md +++ b/doc/install/Configuration-Settings.md @@ -141,9 +141,16 @@ Port of SMTP email server. ```"InviteSalt": "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9YoS"``` 32-character (to be randomly generated via Admin Console) salt added to signing of email invites. - ```"PasswordResetSalt": "vZ4DcKyVVRlKHHJpexcuXzojkE5PZ5eL"``` -32-character (to be randomly generated via Admin Console) salt added to signing of password reset emails. +32-character (to be randomly generated via Admin Console) salt added to signing of password reset emails. + +#### Push Notification Settings + +```"SendPushNotifications": true``` +"true": Your mattermsot server sends mobile push notifications to the server specified in **PushNotificationServer**; "false": Mobile push notifications are disabled. + +```"PushNotificationServer": "https://push.mattermost.com"``` +Address of the proxy server that re-sends push notifications to their respective services like APNS (Apple Push Notification Services). ### File Settings @@ -291,17 +298,6 @@ System Console allows an IT Admin to update settings defined in `config.json`. H ```"EnableOAuthServiceProvider": false``` ”true”: Allow Mattermost to function as an OAuth provider, allowing 3rd party apps access to your user store for authentication. -### Push Notification Settings - -```"ApplePushServer": ""``` -Setting for features in development. - -```"ApplePushCertPublic": ""``` -Setting for features in development. - -```"ApplePushCertPrivate": ""``` -Setting for features in development. - ### File Settings ```"InitialFont": "luximbi.ttf"``` diff --git a/doc/install/Requirements.md b/doc/install/Requirements.md index b877b6dc0..162caf90d 100644 --- a/doc/install/Requirements.md +++ b/doc/install/Requirements.md @@ -4,10 +4,10 @@ Supported Operating Systems and Browsers for the Mattermost Web Client include: -- PC: Windows 7, Windows 8 (Chrome 43+, Firefox 38+, Internet Explorer 10+) -- Mac: OS 10 (Safari 7, Chrome 43+) +- PC: Windows 7, Windows 8, Windows 10 (Chrome 43+, Firefox 38+, Internet Explorer 11, Edge) +- Mac: OS 10 (Safari 9, Chrome 43+) - Linux: Arch 4.0.0 (Chrome 43+) -- iPhone 4s and higher (Safari on iOS 8.3+, Chrome 43+) +- iPhone 4s and higher (Safari on iOS 9+, Chrome 43+) - Android 5 and higher (Chrome 43+) ### Email Client |