summary refs log tree commit diff
path: root/webclient/settings
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-09-16 15:15:19 +0100
committerKegan Dougal <kegan@matrix.org>2014-09-16 15:35:23 +0100
commita402e0c5e6e432a175b48279c972bc9ae7e944bc (patch)
tree5611d5d4bb86b546f27485c14086a6cdd2ad5288 /webclient/settings
parentMove the notification logic out of an individual room controller and into the... (diff)
downloadsynapse-a402e0c5e6e432a175b48279c972bc9ae7e944bc.tar.xz
Added bing detection logic. Persist the display name of the user in localstorage for use when binging.
Diffstat (limited to 'webclient/settings')
-rw-r--r--webclient/settings/settings.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/webclient/settings/settings.html b/webclient/settings/settings.html
index 3b3dd3dadd..1a42ae435a 100644
--- a/webclient/settings/settings.html
+++ b/webclient/settings/settings.html
@@ -51,10 +51,10 @@
         <h3>Desktop notifications</h3>
         <div class="section" ng-switch="settings.notifications">
             <div ng-switch-when="granted">
-                Notifications are enabled.
+                Notifications are enabled. You will be alerted when a message contains your user ID or display name.
                 <div class="section">
-                    <h4>Words to alert on:</h4>
-                    <input size=40 name="bingWords" ng-model="settings.bingWords" ng-list placeholder="Enter words separated with ,"
+                    <h4>Additional words to alert on:</h4>
+                    <input size=40 name="bingWords" ng-model="settings.bingWords" ng-list placeholder="Enter case-sensitive words separated with ,"
                     ng-blur="saveBingWords()"/>
                     <ul>
                         <li ng-repeat="word in settings.bingWords">{{word}}</li>