diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-12-09 13:57:06 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-12-09 13:57:06 -0500 |
| commit | 2396cfafc1ccd24a78be06538ccecab3a62ee3c4 (patch) | |
| tree | 50f4fa307d36e5d2e6156b758a9f13070ab7c9f6 | |
| parent | d81496ffcff121db448bf81e6aeb8e191cf408f2 (diff) | |
| parent | 8c06096fa517dc82c387bd9eb6640f68589a5a9a (diff) | |
| download | chat-2396cfafc1ccd24a78be06538ccecab3a62ee3c4.tar.gz chat-2396cfafc1ccd24a78be06538ccecab3a62ee3c4.tar.bz2 chat-2396cfafc1ccd24a78be06538ccecab3a62ee3c4.zip | |
Merge pull request #1679 from mattermost/lfbrock-patch-1
Update config settings documentation
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | doc/install/Configuration-Settings.md | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 25d188397..a9dad1798 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -70,8 +70,8 @@ Multiple settings were added to [`config.json`](./config/config.json). These opt - Removed: `"ApplePushServer": ""` which is replaced with `SendPushNotifications` and `PushNotificationServer` - Removed: `"ApplePushCertPublic": ""` which is replaced with `SendPushNotifications` and `PushNotificationServer` - Removed: `"ApplePushCertPrivate": ""` which is replaced with `SendPushNotifications` and `PushNotificationServer` - - Added: `"SendPushNotifications": true` to control whether mobile push notifications are sent to the server specified in `PushNotificationServer` - - Added: `"PushNotificationServer": "https://push.mattermost.com"` to specify the address of the proxy server that re-sends push notifications to their respective services like APNS (Apple Push Notification Services) + - Added: `"SendPushNotifications": false` to control whether mobile push notifications are sent to the server specified in `PushNotificationServer` + - Added: `"PushNotificationServer": ""` to specify the address of the proxy server that re-sends push notifications to their respective services like APNS (Apple Push Notification Services) #### Known Issues @@ -81,6 +81,7 @@ Multiple settings were added to [`config.json`](./config/config.json). These opt - No scroll bar in center channel - Pasting images into text box fails to upload on Firefox, Safari, and IE11 - Slack import @mentions break +- Usernames containing a "." do not get mention notifications #### Contributors diff --git a/doc/install/Configuration-Settings.md b/doc/install/Configuration-Settings.md index 46a6defdf..5f9b3b62d 100644 --- a/doc/install/Configuration-Settings.md +++ b/doc/install/Configuration-Settings.md @@ -146,10 +146,10 @@ Port of SMTP email server. #### Push Notification Settings -```"SendPushNotifications": true``` +```"SendPushNotifications": false``` "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"``` +```"PushNotificationServer": ""``` Address of the proxy server that re-sends push notifications to their respective services like APNS (Apple Push Notification Services). |