This repository has been archived by the owner on Mar 13, 2024. It is now read-only.
MM-9721 Update settings text when push notifications are disabled on the server #923
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jwilander
approved these changes
Mar 9, 2018
MarkMaldaba
reviewed
Apr 18, 2018
| @@ -2868,7 +2868,7 @@ | |||
| "user.settings.push_notification.allActivityOnline": "For all activity when online, away or offline", | |||
| "user.settings.push_notification.away": "Away or offline", | |||
| "user.settings.push_notification.disabled": "Disabled by System Administrator", | |||
There was a problem hiding this comment.
Does this line need updating, too?
MarkMaldaba
reviewed
Apr 18, 2018
| @@ -2868,7 +2868,7 @@ | |||
| "user.settings.push_notification.allActivityOnline": "For all activity when online, away or offline", | |||
| "user.settings.push_notification.away": "Away or offline", | |||
| "user.settings.push_notification.disabled": "Disabled by System Administrator", | |||
| "user.settings.push_notification.disabled_long": "Push notifications for mobile devices have been disabled by your System Administrator.", | |||
| "user.settings.push_notification.disabled_long": "Push Notifications are not enabled. Contact your System Administrator.", | |||
There was a problem hiding this comment.
I'm not sure about the instruction to "Contact your System Administrator". That implies that there is something wrong which the system administrator should be made aware of. In some situations this might be appropriate, but in our case we certainly wouldn't want users to be contacting the system administrator about this as it is not something that we will be enabling.
There was a problem hiding this comment.
@MarkMaldaba Good point. What are your thoughts on the following? (more clear on who has control over it, but less deliberate about the action)
Push notifications have not been enabled by your System Administrator.
There was a problem hiding this comment.
That seems like a good compromise.
There was a problem hiding this comment.
PR submitted, thanks for the feedback! #1141
hmhealey
pushed a commit
that referenced
this pull request
Aug 28, 2020
* MM-17152 - Added support for plugins marketplace endpoint (#912) * Added support for plugins marketplace endpoint * Added markeplace plugin status constanst * Fixed field used in installed selector * Updated marketplace route to use base getPluginRoute * Changed state to use new InstalledVersion property to filter installed plugins * Added action to handle error when getting plugins for the marketplace * MM-18139 - Add signature_url to install_from_url api (#917) * MM-18139 - Add signature_url param when invoking install_from_url api * Using plugin_download_url, signature_download_url instead * MM-17550 Added support for search term in get marketplace plugins (#920) * Added support for plugins marketplace endpoint * Added markeplace plugin status constanst * Fixed field used in installed selector * Updated marketplace route to use base getPluginRoute * Changed state to use new InstalledVersion property to filter installed plugins * Added action to handle error when getting plugins for the marketplace * Added support for search in marketplace plugins api * PR Feedback and no results case handling * Moved default value of filter at the time adding params to the url * MM-18103 - Added telemetry events for plugin marketplace (#922) * Added marketplace diagnostics events to whitelist ' * Added search event to whitelist * Revert "MM-18139 - Add signature_url param when invoking install… (#921) This reverts commit 79816fb7db2185d29fc6a2679b0811aed05eb4d1. * MM-18475 - Converge on snake_case responses from the marketplace (#923) * PR Feedback * Removing error handling from redux
hmhealey
pushed a commit
that referenced
this pull request
Mar 17, 2021
* MM-17152 - Added support for plugins marketplace endpoint (#912) * Added support for plugins marketplace endpoint * Added markeplace plugin status constanst * Fixed field used in installed selector * Updated marketplace route to use base getPluginRoute * Changed state to use new InstalledVersion property to filter installed plugins * Added action to handle error when getting plugins for the marketplace * MM-18139 - Add signature_url to install_from_url api (#917) * MM-18139 - Add signature_url param when invoking install_from_url api * Using plugin_download_url, signature_download_url instead * MM-17550 Added support for search term in get marketplace plugins (#920) * Added support for plugins marketplace endpoint * Added markeplace plugin status constanst * Fixed field used in installed selector * Updated marketplace route to use base getPluginRoute * Changed state to use new InstalledVersion property to filter installed plugins * Added action to handle error when getting plugins for the marketplace * Added support for search in marketplace plugins api * PR Feedback and no results case handling * Moved default value of filter at the time adding params to the url * MM-18103 - Added telemetry events for plugin marketplace (#922) * Added marketplace diagnostics events to whitelist ' * Added search event to whitelist * Revert "MM-18139 - Add signature_url param when invoking install… (#921) This reverts commit 79816fb7db2185d29fc6a2679b0811aed05eb4d1. * MM-18475 - Converge on snake_case responses from the marketplace (#923) * PR Feedback * Removing error handling from redux
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
MM-9721 Update settings text when push notifications are disabled on the server
Ticket Link
https://mattermost.atlassian.net/browse/MM-9721
Checklist