diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-04-04 11:54:52 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-04-04 11:54:52 -0400 |
| commit | c7bdce8a6641ed8d361a43b6004a351535c78423 (patch) | |
| tree | f42d32d8a4d0cd4f702644dcb6a594f905f3f771 /config | |
| parent | 3a79e451ffe3ffe618311ee15b02dbebde6a77b0 (diff) | |
| download | chat-c7bdce8a6641ed8d361a43b6004a351535c78423.tar.gz chat-c7bdce8a6641ed8d361a43b6004a351535c78423.tar.bz2 chat-c7bdce8a6641ed8d361a43b6004a351535c78423.zip | |
PLT-5900 Removed automatic configuration of SiteURL (#5952)
* Revert "PLT-5765 Passed SiteURL to SendNotifications (#5705)"
This reverts commit a8e68bd8905972ae59de90fa33d5b3e3c274dc47.
* Removed automatic configuration of SiteURL
* Reverted unintentional config changes
* Updated help text
* Added link to docs in Site URL warning
* Fixed merge conflict
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/config.json b/config/config.json index f1cb04c63..b3dac758a 100644 --- a/config/config.json +++ b/config/config.json @@ -1,6 +1,6 @@ { "ServiceSettings": { - "SiteURL": "", + "SiteURL": "http://localhost:8065", "ListenAddress": ":8065", "ConnectionSecurity": "", "TLSCertFile": "", @@ -55,10 +55,10 @@ "CustomDescriptionText": "", "RestrictDirectMessage": "any", "RestrictTeamInvite": "all", - "RestrictPublicChannelCreation": "all", - "RestrictPrivateChannelCreation": "all", "RestrictPublicChannelManagement": "all", "RestrictPrivateChannelManagement": "all", + "RestrictPublicChannelCreation": "all", + "RestrictPrivateChannelCreation": "all", "RestrictPublicChannelDeletion": "all", "RestrictPrivateChannelDeletion": "all", "RestrictPrivateChannelManageMembers": "all", |