From eb7d7ce354d23e6b53fbb22d07fa7b65e2adc42e Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@matrix.org>
Date: Thu, 4 Sep 2014 11:38:26 +0100
Subject: Re-apply fixes to the link-email screen to make it work again (in a
 somewhat temporary way until home servers sign associations). Unhide the
 linked emails box.

---
 webclient/settings/settings.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'webclient/settings/settings.html')

diff --git a/webclient/settings/settings.html b/webclient/settings/settings.html
index b7fd5dfb50..0af137d0a7 100644
--- a/webclient/settings/settings.html
+++ b/webclient/settings/settings.html
@@ -23,14 +23,14 @@
         </div>
         <br/>
 
-        <h3 style="display: none; ">Linked emails</h3>
-        <div class="section" style="display: none; ">
+        <h3>Linked emails</h3>
+        <div class="section">
             <form>
                 <input size="40" ng-model="linkedEmails.linkNewEmail" ng-enter="linkEmail(linkedEmails.linkNewEmail)" />
                 <button ng-disabled="!linkedEmails.linkNewEmail" ng-click="linkEmail(linkedEmails.linkNewEmail)">
                     Link Email
                 </button>
-                {{ emailFeedback }}    
+                {{ emailFeedback }}
             </form>
             <form ng-hide="!linkedEmails.emailBeingAuthed">
                 Enter validation token for {{ linkedEmails.emailBeingAuthed }}:
-- 
cgit 1.4.1


From 3a888089832c18306d99d429a1f87d3c685e0a60 Mon Sep 17 00:00:00 2001
From: Emmanuel ROHEE <erohee@amdocs.com>
Date: Fri, 5 Sep 2014 17:32:35 +0200
Subject: doc: kick can take a reason arg

---
 webclient/settings/settings.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'webclient/settings/settings.html')

diff --git a/webclient/settings/settings.html b/webclient/settings/settings.html
index 0af137d0a7..924812e7ae 100644
--- a/webclient/settings/settings.html
+++ b/webclient/settings/settings.html
@@ -81,7 +81,7 @@
             <ul>
                 <li>/nick &lt;display_name&gt;: change your display name</li>
                 <li>/me &lt;action&gt;: send the action you are doing. /me will be replaced by your display name</li>
-                <li>/kick &lt;user_id&gt;: kick the user</li>
+                <li>/kick &lt;user_id&gt; [&lt;reason&gt;]: kick the user</li>
                 <li>/ban &lt;user_id&gt; [&lt;reason&gt;]: ban the user</li>
                 <li>/unban &lt;user_id&gt;: unban the user</li>
                 <li>/op &lt;user_id&gt; &lt;power_level&gt;: set user power level</li>
-- 
cgit 1.4.1