Merge branch 'develop' into luke/feature-app-tile-ux

src/TextForEvent.js

@@ -248,6 +248,28 @@ function textForPowerEvent(event) {
     });
 }
 
+function textForWidgetEvent(event) {
+    const senderName = event.sender ? event.sender.name : event.getSender();
+    const previousContent = event.getPrevContent() || {};
+    const {name, type, url} = event.getContent() || {};
+    let widgetName = widgetName || name || type || previousContent.type || '';
+
+    // Apply sentence case
+    widgetName = widgetName ? widgetName[0].toUpperCase() + widgetName.slice(1).toLowerCase() + ' ' : '';
+
+    // If the widget was removed, its content should be {}, but this is sufficiently
+    // equivalent to that condition.
+    if (url) {
+        return _t('%(senderName)s added a %(widgetName)swidget', {
+            senderName, widgetName,
+        });
+    } else {
+        return _t('%(senderName)s removed a %(widgetName)swidget', {
+            senderName, widgetName,
+        });
+    }
+}
+
 var handlers = {
     'm.room.message': textForMessageEvent,
     'm.room.name':    textForRoomNameEvent,
@@ -260,6 +282,8 @@ var handlers = {
     'm.room.history_visibility': textForHistoryVisibilityEvent,
     'm.room.encryption': textForEncryptionEvent,
     'm.room.power_levels': textForPowerEvent,
+
+    'im.vector.modular.widgets': textForWidgetEvent,
 };
 
 module.exports = {

src/components/views/elements/AppTile.js

@@ -45,6 +45,10 @@ export default React.createClass({
         // Specifying 'fullWidth' as true will render the app tile to fill the width of the app drawer continer.
         // This should be set to true when there is only one widget in the app drawer, otherwise it should be false.
         fullWidth: React.PropTypes.bool,
+        // UserId of the current user
+        userId: React.PropTypes.string.isRequired,
+        // UserId of the entity that added / modified the widget
+        creatorUserId: React.PropTypes.string,
     },
 
     getDefaultProps: function() {
@@ -60,7 +64,8 @@ export default React.createClass({
             loading: false,
             widgetUrl: this.props.url,
             widgetPermissionId: widgetPermissionId,
-            hasPermissionToLoad: Boolean(hasPermissionToLoad === 'true'),
+            // Assume that widget has permission to load if we are the user who added it to the room, or if explicitly granted by the user
+            hasPermissionToLoad: hasPermissionToLoad === 'true' || this.props.userId === this.props.creatorUserId,
             error: null,
             deleting: false,
         };

src/components/views/login/CaptchaForm.js

@@ -17,7 +17,7 @@ limitations under the License.
 'use strict';
 
 import React from 'react';
-import { _t } from '../../../languageHandler';
+import { _t, _tJsx } from '../../../languageHandler';
 
 var DIV_ID = 'mx_recaptcha';
 
@@ -66,7 +66,11 @@ module.exports = React.createClass({
                 // * jumping straight to a hosted captcha page (but we don't support that yet)
                 // * embedding the captcha in an iframe (if that works)
                 // * using a better captcha lib
-                warning.innerHTML = "Robot check is currently unavailable on desktop - please use a <a href='https://riot.im/app'>web browser</a>.";
+                warning.innerHTML = _tJsx(
+                     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>",
+                     /<a>(.*?)<\/a>/,
+                     (sub) => { return "<a href='https://riot.im/app'>{ sub }</a>"; }
+                 );
                 this.refs.recaptchaContainer.appendChild(warning);
             }
             else {

src/components/views/rooms/AppsDrawer.js

@@ -94,7 +94,7 @@ module.exports = React.createClass({
         return pathTemplate;
     },
 
-    _initAppConfig: function(appId, app) {
+    _initAppConfig: function(appId, app, sender) {
         const user = MatrixClientPeg.get().getUser(this.props.userId);
         const params = {
             '$matrix_user_id': this.props.userId,
@@ -112,6 +112,7 @@ module.exports = React.createClass({
         app.id = appId;
         app.name = app.name || app.type;
         app.url = this.encodeUri(app.url, params);
+        app.creatorUserId = (sender && sender.userId) ? sender.userId : null;
 
         return app;
     },
@@ -132,7 +133,7 @@ module.exports = React.createClass({
         return appsStateEvents.filter((ev) => {
             return ev.getContent().type && ev.getContent().url;
         }).map((ev) => {
-            return this._initAppConfig(ev.getStateKey(), ev.getContent());
+            return this._initAppConfig(ev.getStateKey(), ev.getContent(), ev.sender);
         });
     },
 
@@ -185,6 +186,7 @@ module.exports = React.createClass({
                     room={this.props.room}
                     userId={this.props.userId}
                     show={this.props.showApps}
+                    creatorUserId={app.creatorUserId}
                 />);
             });
 

src/components/views/rooms/AuxPanel.js

@@ -139,7 +139,7 @@ module.exports = React.createClass({
         }
 
         return (
-            <div className="mx_RoomView_auxPanel" style={{maxHeight: this.props.maxHeight}} >
+            <div className={ appsDrawer ? "mx_RoomView_auxPanel mx_RoomView_auxPanel_apps" : "mx_RoomView_auxPanel" } style={{maxHeight: this.props.maxHeight}} >
                 { appsDrawer }
                 { fileDropTarget }
                 { callView }

src/components/views/rooms/EventTile.js

@@ -44,6 +44,8 @@ var eventTileTypes = {
     'm.room.history_visibility' : 'messages.TextualEvent',
     'm.room.encryption' : 'messages.TextualEvent',
     'm.room.power_levels' : 'messages.TextualEvent',
+
+    'im.vector.modular.widgets': 'messages.TextualEvent',
 };
 
 var MAX_READ_AVATARS = 5;

src/components/views/rooms/RoomSettings.js

@@ -871,7 +871,7 @@ module.exports = React.createClass({
                             <input type="checkbox" disabled={ !roomState.mayClientSendStateEvent("m.room.aliases", cli) }
                                    onChange={ this._onToggle.bind(this, "isRoomPublished", true, false)}
                                    checked={this.state.isRoomPublished}/>
-                            {_t("List this room in %(domain)s's room directory?", { domain: MatrixClientPeg.get().getDomain() })}
+                            {_t("Publish this room to the public in %(domain)s's room directory?", { domain: MatrixClientPeg.get().getDomain() })}
                         </label>
                     </div>
                     <div className="mx_RoomSettings_settings">

src/components/views/settings/DevicesPanelEntry.js

@@ -71,7 +71,7 @@ export default class DevicesPanelEntry extends React.Component {
             // pop up an interactive auth dialog
             var InteractiveAuthDialog = sdk.getComponent("dialogs.InteractiveAuthDialog");
 
-            Modal.createTrackedDialog('Delete Device Dialog', InteractiveAuthDialog, {
+            Modal.createTrackedDialog('Delete Device Dialog', '', InteractiveAuthDialog, {
                 title: _t("Authentication"),
                 matrixClient: MatrixClientPeg.get(),
                 authData: error.data,

src/i18n/strings/de_DE.json

@@ -853,7 +853,7 @@
     "device id: ": "Geräte-ID: ",
     "Device key:": "Geräte-Schlüssel:",
     "Email address (optional)": "E-Mail-Adresse (optional)",
-    "List this room in %(domain)s's room directory?": "Diesen Raum zum Raum-Verzeichnis von %(domain)s hinzufügen?",
+    "Publish this room to the public in %(domain)s's room directory?": "Diesen Raum mittels Raum-Verzeichnis von %(domain)s veröffentlichen?",
     "Mobile phone number (optional)": "Mobilfunknummer (optional)",
     "Password:": "Passwort:",
     "Register": "Registrieren",

src/i18n/strings/el.json

@@ -297,7 +297,6 @@
     "left": "έφυγε",
     "%(targetName)s left the room.": "Ο χρήστης %(targetName)s έφυγε από το δωμάτιο.",
     "Level": "Επίπεδο",
-    "List this room in %(domain)s's room directory?": "Να εμφανίζεται το δωμάτιο στο γενικό ευρετήριο του διακομιστή %(domain)s;",
     "Local addresses for this room:": "Τοπική διεύθυνση για το δωμάτιο:",
     "Logged in as:": "Συνδεθήκατε ως:",
     "Login as guest": "Σύνδεση ως επισκέπτης",

src/i18n/strings/en_EN.json

@@ -392,7 +392,7 @@
     "left": "left",
     "%(targetName)s left the room.": "%(targetName)s left the room.",
     "Level:": "Level:",
-    "List this room in %(domain)s's room directory?": "List this room in %(domain)s's room directory?",
+    "Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?",
     "Local addresses for this room:": "Local addresses for this room:",
     "Logged in as:": "Logged in as:",
     "Login as guest": "Login as guest",
@@ -969,5 +969,8 @@
     "Automatically replace plain text Emoji": "Automatically replace plain text Emoji",
     "Failed to upload image": "Failed to upload image",
     "Failed to update group": "Failed to update group",
-    "Hide avatars in user and room mentions": "Hide avatars in user and room mentions"
+    "Hide avatars in user and room mentions": "Hide avatars in user and room mentions",
+    "%(senderName)s added a %(widgetName)swidget": "%(senderName)s added a %(widgetName)swidget",
+    "%(senderName)s removed a %(widgetName)swidget": "%(senderName)s removed a %(widgetName)swidget",
+    "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot check is currently unavailable on desktop - please use a <a>web browser</a>"
 }

src/i18n/strings/en_US.json

@@ -359,7 +359,7 @@
     "left": "left",
     "%(targetName)s left the room.": "%(targetName)s left the room.",
     "Level": "Level",
-    "List this room in %(domain)s's room directory?": "List this room in %(domain)s's room directory?",
+    "Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?",
     "Local addresses for this room:": "Local addresses for this room:",
     "Logged in as:": "Logged in as:",
     "Login as guest": "Login as guest",

src/i18n/strings/es.json

@@ -500,7 +500,6 @@
     "Drop File Here": "Deje el fichero aquí",
     "Guest access is disabled on this Home Server.": "El acceso de invitados está desactivado en este servidor.",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Conecte con <voiceText>voz</voiceText> o <videoText>vídeo</videoText>.",
-    "List this room in %(domain)s's room directory?": "¿Mostrar esta sala en el directorio de %(domain)s?",
     "Manage Integrations": "Gestionar integraciones",
     "Markdown is disabled": "Markdown está desactivado",
     "Markdown is enabled": "Markdown está activado",

src/i18n/strings/eu.json

@@ -464,7 +464,6 @@
     "left": "atera da",
     "%(targetName)s left the room.": "%(targetName)s erabiltzailea gelatik atera da.",
     "Level:": "Maila:",
-    "List this room in %(domain)s's room directory?": "Gela hau %(domain)s's domeinuko gelen direktorioan zerrendatu?",
     "Local addresses for this room:": "Gela honen tokiko helbideak:",
     "Logged in as:": "Saioa hasteko erabiltzailea:",
     "Login as guest": "Hasi saioa bisitari gisa",

src/i18n/strings/fr.json

@@ -813,7 +813,6 @@
     "device id: ": "Identifiant appareil : ",
     "Device key:": "Clé de l’appareil :",
     "Email address (optional)": "Adresse e-mail (facultatif)",
-    "List this room in %(domain)s's room directory?": "Lister ce salon dans le répertoire de %(domain)s ?",
     "Mobile phone number (optional)": "Numéro de téléphone (facultatif)",
     "Password:": "Mot de passe :",
     "Register": "S'inscrire",

src/i18n/strings/hu.json

@@ -404,7 +404,6 @@
     "left": "kilépett",
     "%(targetName)s left the room.": "%(targetName)s elhagyta a szobát.",
     "Level:": "Szint:",
-    "List this room in %(domain)s's room directory?": "%(domain)s szobát feltüntessük a szobák listájában?",
     "Local addresses for this room:": "A szoba helyi címe:",
     "Logged in as:": "Bejelentkezve mint:",
     "Login as guest": "Belépés vendégként",

src/i18n/strings/ja.json

@@ -48,7 +48,6 @@
     "%(count)s new messages.other": "新しい発言 %(count)s",
     "Don't send typing notifications": "文字入力中であることを公表しない",
     "Filter room members": "参加者検索",
-    "List this room in %(domain)s's room directory?": "この部屋を %(domain)s サーバの部屋一覧に公開する？",
     "Send a message (unencrypted)": "ここに送信文を入力 (暗号化なし)",
     "Send an encrypted message": "暗号文を送る",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "発言時刻を12時間形式で表示 (例 2:30PM)",

src/i18n/strings/ko.json

@@ -405,7 +405,6 @@
     "left": "떠났음",
     "%(targetName)s left the room.": "%(targetName)s님이 방을 떠나셨어요.",
     "Level:": "등급:",
-    "List this room in %(domain)s's room directory?": "%(domain)s's 방 목록에 이 방을 놓으시겠어요?",
     "Local addresses for this room:": "이 방의 로컬 주소:",
     "Logged in as:": "로그인:",
     "Login as guest": "손님으로 로그인",

src/i18n/strings/lv.json

@@ -380,7 +380,6 @@
     "left": "atstāja",
     "%(targetName)s left the room.": "%(targetName)s atstāja istabu.",
     "Level:": "Līmenis:",
-    "List this room in %(domain)s's room directory?": "Rādīt šo istabu %(domain)s kataloga sarakstā?",
     "Local addresses for this room:": "Šīs istabas lokālās adreses:",
     "Logged in as:": "Pierakstījās kā:",
     "Login as guest": "Pierakstīties kā viesis",

src/i18n/strings/nl.json

@@ -480,7 +480,6 @@
     "left": "verlaten",
     "%(targetName)s left the room.": "%(targetName)s heeft de ruimte verlaten.",
     "Level:": "Niveau:",
-    "List this room in %(domain)s's room directory?": "Deze ruimte in %(domain)s's ruimte catalogus vermelden?",
     "Local addresses for this room:": "Lokale adressen voor deze ruimte:",
     "Logged in as:": "Ingelogd als:",
     "Login as guest": "Als gast inloggen",

src/i18n/strings/pt.json

@@ -862,7 +862,6 @@
     "device id: ": "id do dispositivo: ",
     "Device key:": "Chave do dispositivo:",
     "Email address (optional)": "Endereço de e-mail (opcional)",
-    "List this room in %(domain)s's room directory?": "Deseja listar esta sala na lista pública de salas de %(domain)s?",
     "Mobile phone number (optional)": "Número de telefone celular (opcional)",
     "Password:": "Senha:",
     "Register": "Registre-se",

src/i18n/strings/pt_BR.json

@@ -863,7 +863,6 @@
     "device id: ": "id do dispositivo: ",
     "Device key:": "Chave do dispositivo:",
     "Email address (optional)": "Endereço de e-mail (opcional)",
-    "List this room in %(domain)s's room directory?": "Deseja listar esta sala na lista pública de salas de %(domain)s?",
     "Mobile phone number (optional)": "Número de telefone celular (opcional)",
     "Password:": "Senha:",
     "Register": "Registre-se",

src/i18n/strings/ru.json

@@ -702,7 +702,6 @@
     "Invalid file%(extra)s": "Недопустимый файл%(extra)s",
     "Invited": "Приглашен",
     "Jump to first unread message.": "Перейти к первому непрочитанному сообщению.",
-    "List this room in %(domain)s's room directory?": "Показывать эту комнату в каталоге комнат %(domain)s?",
     "Message not sent due to unknown devices being present": "Сообщение не отправлено из-за присутствия неизвестных устройств",
     "Mobile phone number (optional)": "Номер мобильного телефона (не обязательно)",
     "Once you've followed the link it contains, click below": "После перехода по ссылке, нажмите на кнопку ниже",

src/i18n/strings/sv.json

@@ -385,7 +385,6 @@
     "left": "lämnade",
     "%(targetName)s left the room.": "%(targetName)s lämnade rummet.",
     "Level:": "Nivå:",
-    "List this room in %(domain)s's room directory?": "Visa det här rummet i katalogen på %(domain)s?",
     "Local addresses for this room:": "Lokala adresser för rummet:",
     "Logged in as:": "Inloggad som:",
     "Login as guest": "Logga in som gäst",

src/i18n/strings/th.json

@@ -231,7 +231,6 @@
     "left and rejoined": "ออกแล้วกลับเข้าร่วมอีกครั้ง",
     "left": "ออกไปแล้ว",
     "%(targetName)s left the room.": "%(targetName)s ออกจากห้องแล้ว",
-    "List this room in %(domain)s's room directory?": "แสดงห้องนี้ในไดเรกทอรีห้องของ %(domain)s?",
     "Logged in as:": "เข้าสู่ระบบในชื่อ:",
     "Login as guest": "เข้าสู่ระบบในฐานะแขก",
     "Logout": "ออกจากระบบ",

src/i18n/strings/tr.json

@@ -380,7 +380,6 @@
     "left": "ayrıldı",
     "%(targetName)s left the room.": "%(targetName)s odadan ayrıldı.",
     "Level:": "Seviye :",
-    "List this room in %(domain)s's room directory?": "Bu oda %(domain)s' in oda dizininde listelensin mi ?",
     "Local addresses for this room:": "Bu oda için yerel adresler :",
     "Logged in as:": "Olarak giriş yaptı :",
     "Login as guest": "Misafir olarak giriş yaptı",

src/i18n/strings/zh_Hant.json

@@ -517,7 +517,6 @@
     "left and rejoined": "離開並重新加入",
     "left": "離開",
     "Level:": "等級：",
-    "List this room in %(domain)s's room directory?": "在 %(domain)s 的房間目錄中列出此房間嗎？",
     "Local addresses for this room:": "此房間的本機地址：",
     "Logged in as:": "登入為：",
     "Logout": "登出",