PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' into develop

Browse source
This commit is contained in:
David Baker 2018-06-12 14:26:29 +01:00
commit e858cf3bcb
35 changed files with 36 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
CHANGELOG.md
View file

@ -1,3 +1,28 @@
Changes in [0.12.7](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.7) (2018-06-12)
=====================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.7-rc.1...v0.12.7)
* No changes since rc.1
Changes in [0.12.7-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.7-rc.1) (2018-06-06)
===============================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.6...v0.12.7-rc.1)
* Update from Weblate.
[\#1944](https://github.com/matrix-org/matrix-react-sdk/pull/1944)
* Import react as React in src/components/views/elements/DNDTagTile.js
[\#1943](https://github.com/matrix-org/matrix-react-sdk/pull/1943)
* Fix click on faded left/right/middle panel -> close settings
[\#1940](https://github.com/matrix-org/matrix-react-sdk/pull/1940)
* Add null-guard to support browsers that don't support performance
[\#1942](https://github.com/matrix-org/matrix-react-sdk/pull/1942)
* Support third party integration managers in AppPermission
[\#1455](https://github.com/matrix-org/matrix-react-sdk/pull/1455)
* Update pinned messages in real time
[\#1934](https://github.com/matrix-org/matrix-react-sdk/pull/1934)
* Expose at-room power level setting
[\#1938](https://github.com/matrix-org/matrix-react-sdk/pull/1938)
Changes in [0.12.6](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.6) (2018-05-25)
=====================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.6-rc.1...v0.12.6)

4
package.json
View file

@ -1,6 +1,6 @@
{
"name": "matrix-react-sdk",
"version": "0.12.6",
"version": "0.12.7",
"description": "SDK for matrix.org using React",
"author": "matrix.org",
"repository": {
@ -76,7 +76,7 @@
"linkifyjs": "^2.1.3",
"lodash": "^4.13.1",
"lolex": "2.3.2",
"matrix-js-sdk": "0.10.3",
"matrix-js-sdk": "0.10.4",
"optimist": "^0.6.1",
"pako": "^1.0.5",
"prop-types": "^15.5.8",

8
src/components/structures/UserSettings.js
View file

@ -284,7 +284,13 @@ module.exports = React.createClass({
this.setState({ electron_settings: settings });
},
_refreshMediaDevices: function() {
_refreshMediaDevices: function(stream) {
if (stream) {
// kill stream so that we don't leave it lingering around with webcam enabled etc
// as here we called gUM to ask user for permission to their device names only
stream.getTracks().forEach((track) => track.stop());
}
Promise.resolve().then(() => {
return CallMediaHandler.getDevices();
}).then((mediaDevices) => {

2
src/components/structures/login/Login.js
View file

@ -399,7 +399,7 @@ module.exports = React.createClass({
if (this.props.enableGuest) {
loginAsGuestJsx =
<a className="mx_Login_create" onClick={this._onLoginAsGuestClick} href="#">
{ _t('Login as guest') }
{ _t('Try the app first') }
</a>;
}

1
src/i18n/strings/bg.json
View file

@ -888,7 +888,6 @@
"This homeserver doesn't offer any login flows which are supported by this client.": "Този Home сървър не предлага методи за влизане, които се поддържат от този клиент.",
"Error: Problem communicating with the given homeserver.": "Грешка: Проблем при комуникацията с дадения Home сървър.",
"Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Не е възможно свързване към Home сървъра чрез HTTP, когато има HTTPS адрес в лентата на браузъра Ви. Или използвайте HTTPS или <a>включете функция небезопасни скриптове</a>.",
"Login as guest": "Влез като гост",
"Sign in to get started": "Влезте в профила си, за да започнете",
"Set a display name:": "Задаване на име:",
"Upload an avatar:": "Качване на профилна снимка:",

1
src/i18n/strings/ca.json
View file

@ -579,7 +579,6 @@
"%(nameList)s %(transitionList)s": "%(transitionList)s%(nameList)s",
"%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s han entrat",
"Guest access is disabled on this Home Server.": "L'accés a usuaris d'altres xarxes no està permès en aquest servidor.",
"Login as guest": "Inicia sessió com a convidat",
"Unblacklist": "Treure de la llista negre",
"%(oneUser)sjoined %(count)s times|one": "%(oneUser)s s'ha unit",
"%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s han sortit",

1
src/i18n/strings/cs.json
View file

@ -239,7 +239,6 @@
"Level:": "Úroveň:",
"Local addresses for this room:": "Místní adresy této místnosti:",
"Logged in as:": "Přihlášen/a jako:",
"Login as guest": "Přihlášen/a jako host",
"matrix-react-sdk version:": "Verze matrix-react-sdk:",
"Mobile phone number": "Číslo mobilního telefonu",
"Mobile phone number (optional)": "Číslo mobilního telefonu (nepovinné)",

1
src/i18n/strings/da.json
View file

@ -39,7 +39,6 @@
"Searches DuckDuckGo for results": "Søger DuckDuckGo for resultater",
"Commands": "kommandoer",
"Emoji": "Emoji",
"Login as guest": "Log ind som gæst",
"Sign in": "Log ind",
"Warning!": "Advarsel!",
"Account": "Konto",

1
src/i18n/strings/de_DE.json
View file

@ -40,7 +40,6 @@
"Searches DuckDuckGo for results": "Verwendet DuckDuckGo für Suchergebnisse",
"Commands": "Kommandos",
"Emoji": "Emoji",
"Login as guest": "Als Gast anmelden",
"Sign in": "Anmelden",
"Warning!": "Warnung!",
"Error": "Fehler",

1
src/i18n/strings/el.json
View file

@ -142,7 +142,6 @@
"%(targetName)s left the room.": "Ο χρήστης %(targetName)s έφυγε από το δωμάτιο.",
"Local addresses for this room:": "Τοπική διεύθυνση για το δωμάτιο:",
"Logged in as:": "Συνδεθήκατε ως:",
"Login as guest": "Σύνδεση ως επισκέπτης",
"Logout": "Αποσύνδεση",
"Low priority": "Χαμηλής προτεραιότητας",
"matrix-react-sdk version:": "Έκδοση matrix-react-sdk:",

2
src/i18n/strings/en_EN.json
View file

@ -1121,7 +1121,7 @@
"Error: Problem communicating with the given homeserver.": "Error: Problem communicating with the given homeserver.",
"Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.",
"Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.",
"Login as guest": "Login as guest",
"Try the app first": "Try the app first",
"Sign in to get started": "Sign in to get started",
"Failed to fetch avatar URL": "Failed to fetch avatar URL",
"Set a display name:": "Set a display name:",

1
src/i18n/strings/en_US.json
View file

@ -209,7 +209,6 @@
"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",
"Logout": "Logout",
"Low priority": "Low priority",
"%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s made future room history visible to all room members, from the point they are invited.",

1
src/i18n/strings/eo.json
View file

@ -862,7 +862,6 @@
"Error: Problem communicating with the given homeserver.": "Eraro: Estas problemo en komunikado kun la hejmservilo.",
"Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Hejmservilo ne alkonekteblas per HTTP kun HTTPS URL en via adresbreto. Aŭ uzu HTTPS aŭ <a>ŝaltu malsekurajn skriptojn</a>.",
"Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Ne eblas konekti al hejmservilo – bonvolu kontroli vian konekton, certigi ke <a>la SSL-atestilo de via hejmservilo</a> estas fidata, kaj ke neniu foliumila kromprogramo baras petojn.",
"Login as guest": "Saluti kiel gasto",
"Sign in to get started": "Komencu per saluto",
"Failed to fetch avatar URL": "Malsukcesis venigi adreson de profilbildo",
"Set a display name:": "Agordi vidigan nomon:",

1
src/i18n/strings/es.json
View file

@ -166,7 +166,6 @@
"%(targetName)s left the room.": "%(targetName)s ha dejado la sala.",
"Local addresses for this room:": "Direcciones locales para esta sala:",
"Logged in as:": "Sesión iniciada como:",
"Login as guest": "Iniciar sesión como invitado",
"Logout": "Cerrar Sesión",
"Low priority": "Baja prioridad",
"Accept": "Aceptar",

1
src/i18n/strings/eu.json
View file

@ -298,7 +298,6 @@
"Level:": "Maila:",
"Local addresses for this room:": "Gela honen tokiko helbideak:",
"Logged in as:": "Saioa hasteko erabiltzailea:",
"Login as guest": "Hasi saioa bisitari gisa",
"%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat, gonbidapena egiten zaienetik.",
"%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat, elkartzen direnetik.",
"%(senderName)s made future room history visible to all room members.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat.",

1
src/i18n/strings/fi.json
View file

@ -198,7 +198,6 @@
"Level:": "Taso:",
"Local addresses for this room:": "Tämän huoneen paikalliset osoitteet:",
"Logged in as:": "Kirjautunut käyttäjänä:",
"Login as guest": "Kirjaudu vieraana",
"Logout": "Kirjaudu ulos",
"Low priority": "Alhainen prioriteetti",
"Manage Integrations": "Hallinoi integraatioita",

1
src/i18n/strings/fr.json
View file

@ -166,7 +166,6 @@
"%(targetName)s left the room.": "%(targetName)s a quitté le salon.",
"Local addresses for this room:": "Adresses locales pour ce salon :",
"Logged in as:": "Identifié en tant que :",
"Login as guest": "Se connecter en tant que visiteur",
"Logout": "Se déconnecter",
"Low priority": "Priorité basse",
"%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s a rendu l'historique visible à tous les membres du salon, depuis le moment où ils ont été invités.",

1
src/i18n/strings/gl.json
View file

@ -879,7 +879,6 @@
"Error: Problem communicating with the given homeserver.": "Fallo: problema ao comunicarse con servidor proporcionado.",
"Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Non se pode conectar ao servidor vía HTTP cando na barra de enderezos do navegador está HTTPS. Utilice HTTPS ou <a>active scripts non seguros</a>.",
"Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Non se conectou ao servidor - por favor comprobe a conexión, asegúrese de o <a>certificado SSL do servidor</a> é de confianza, e que ningún engadido do navegador está bloqueando as peticións.",
"Login as guest": "Conexión como convidado",
"Sign in to get started": "Conéctese para iniciar",
"Failed to fetch avatar URL": "Fallo ao obter o URL do avatar",
"Set a display name:": "Establecer nome público:",

1
src/i18n/strings/hu.json
View file

@ -238,7 +238,6 @@
"Level:": "Szint:",
"Local addresses for this room:": "A szoba helyi címe:",
"Logged in as:": "Bejelentkezve mint:",
"Login as guest": "Belépés vendégként",
"Logout": "Kilép",
"Low priority": "Alacsony prioritás",
"%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s elérhetővé tette a szoba új üzeneteit nekik minden résztvevő a szobában, amióta meg van hívva.",

1
src/i18n/strings/id.json
View file

@ -62,7 +62,6 @@
"Sign in with": "Masuk dengan",
"Leave room": "Meninggalkan ruang",
"Level:": "Tingkat:",
"Login as guest": "Masuk sebagai tamu",
"Logout": "Keluar",
"Low priority": "Prioritas rendah",
"Markdown is disabled": "Markdown dinonaktifkan",

1
src/i18n/strings/it.json
View file

@ -909,7 +909,6 @@
"Error: Problem communicating with the given homeserver.": "Errore: problema di comunicazione con l'homeserver dato.",
"Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Impossibile connettersi all'homeserver via HTTP quando c'è un URL HTTPS nella barra del tuo browser. Usa HTTPS o <a>attiva gli script non sicuri</a>.",
"Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Impossibile connettersi all'homeserver - controlla la tua connessione, assicurati che il <a>certificato SSL dell'homeserver</a> sia fidato e che un'estensione del browser non stia bloccando le richieste.",
"Login as guest": "Accedi come ospite",
"Sign in to get started": "Accedi per iniziare",
"Failed to fetch avatar URL": "Ricezione URL dell'avatar fallita",
"Set a display name:": "Imposta un nome visualizzato:",

1
src/i18n/strings/ko.json
View file

@ -240,7 +240,6 @@
"Level:": "등급:",
"Local addresses for this room:": "이 방의 로컬 주소:",
"Logged in as:": "로그인:",
"Login as guest": "손님으로 로그인",
"Logout": "로그아웃",
"Low priority": "낮은 우선순위",
"%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s님이 이후 방의 기록을 볼 수 있게 하셨어요 방 구성원 모두, 초대받은 시점부터.",

1
src/i18n/strings/lv.json
View file

@ -224,7 +224,6 @@
"Level:": "Līmenis:",
"Local addresses for this room:": "Šīs istabas lokālās adreses:",
"Logged in as:": "Pierakstījās kā:",
"Login as guest": "Pierakstīties kā viesim",
"Logout": "Izrakstīties",
"Low priority": "Zemas prioritātes",
"%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem no brīža, kad tie tika uzaicināti.",

1
src/i18n/strings/nl.json
View file

@ -305,7 +305,6 @@
"Level:": "Niveau:",
"Local addresses for this room:": "Lokale adressen voor deze ruimte:",
"Logged in as:": "Ingelogd als:",
"Login as guest": "Als gast inloggen",
"Logout": "Uitloggen",
"Low priority": "Lage prioriteit",
"%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s heeft de toekomstige ruimtegeschiedenis zichtbaar gemaakt voor alle ruimte deelnemers, vanaf het moment dat ze uitgenodigd zijn.",

1
src/i18n/strings/pl.json
View file

@ -303,7 +303,6 @@
"Publish this room to the public in %(domain)s's room directory?": "Czy opublikować ten pokój dla ogółu w spisie pokojów domeny %(domain)s?",
"Local addresses for this room:": "Lokalne adresy dla tego pokoju:",
"Logged in as:": "Zalogowany jako:",
"Login as guest": "Zaloguj jako gość",
"Logout": "Wyloguj",
"Low priority": "Niski priorytet",
"%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s uczynił przyszłą historię pokoju widoczną dla wszyscy członkowie pokoju, od momentu ich zaproszenia.",

1
src/i18n/strings/pt.json
View file

@ -83,7 +83,6 @@
"Kicks user with given id": "Remove usuário com o identificador informado",
"Labs": "Laboratório",
"Leave room": "Sair da sala",
"Login as guest": "Entrar como visitante",
"Logout": "Sair",
"Low priority": "Baixa prioridade",
"Manage Integrations": "Gerenciar integrações",

1
src/i18n/strings/pt_BR.json
View file

@ -83,7 +83,6 @@
"Kicks user with given id": "Remove usuário com o identificador informado",
"Labs": "Laboratório",
"Leave room": "Sair da sala",
"Login as guest": "Entrar como visitante",
"Logout": "Sair",
"Low priority": "Baixa prioridade",
"Manage Integrations": "Gerenciar integrações",

1
src/i18n/strings/ru.json
View file

@ -75,7 +75,6 @@
"Kicks user with given id": "Выкидывает пользователя с заданным ID",
"Labs": "Лаборатория",
"Leave room": "Покинуть комнату",
"Login as guest": "Войти как гость",
"Logout": "Выйти",
"Low priority": "Неважные",
"Manage Integrations": "Управление интеграциями",

1
src/i18n/strings/sk.json
View file

@ -822,7 +822,6 @@
"Error: Problem communicating with the given homeserver.": "Chyba: Nie je možné komunikovať so zadaným domovským serverom.",
"Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "K domovskému serveru nie je možné pripojiť sa použitím protokolu HTTP keďže v adresnom riadku prehliadača máte HTTPS adresu. Použite protokol HTTPS alebo <a>povolte nezabezpečené skripty</a>.",
"Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Nie je možné pripojiť sa k domovskému serveru - skontrolujte prosím funkčnosť vašeho pripojenia na internet, uistite sa že <a>certifikát domovského servera</a> je dôverihodný, a že žiaden doplnok nainštalovaný v prehliadači nemôže blokovať požiadavky.",
"Login as guest": "Prihlásiť sa ako hosť",
"Failed to fetch avatar URL": "Nepodarilo sa získať URL adresu obrázka",
"Set a display name:": "Nastaviť zobrazované meno:",
"Upload an avatar:": "Nahrať obrázok:",

1
src/i18n/strings/sr.json
View file

@ -903,7 +903,6 @@
"Error: Problem communicating with the given homeserver.": "Грешка: проблем у комуницирању са датим кућним сервером.",
"Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Не могу да се повежем на кућни сервер преко HTTP-а када се користи HTTPS адреса у траци вашег прегледача. Или користите HTTPS или <a>омогућите небезбедне скрипте</a>.",
"Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Не могу да се повежем на кућни сервер. Проверите вашу интернет везу, постарајте се да верујете <a>SSL сертификату кућног сервера</a> и да проширење прегледача не блокира захтеве.",
"Login as guest": "Пријави се као гост",
"Sign in to get started": "Пријави се да почнеш",
"Failed to fetch avatar URL": "Нисам успео да добавим адресу аватара",
"Set a display name:": "Постави приказно име:",

1
src/i18n/strings/sv.json
View file

@ -224,7 +224,6 @@
"Level:": "Nivå:",
"Local addresses for this room:": "Lokala adresser för rummet:",
"Logged in as:": "Inloggad som:",
"Login as guest": "Logga in som gäst",
"Logout": "Logga ut",
"Low priority": "Låg prioritet",
"%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gjorde framtida rumshistorik synligt för alla rumsmedlemmar från att de bjöds in.",

1
src/i18n/strings/th.json
View file

@ -178,7 +178,6 @@
"Leave room": "ออกจากห้อง",
"%(targetName)s left the room.": "%(targetName)s ออกจากห้องแล้ว",
"Logged in as:": "เข้าสู่ระบบในชื่อ:",
"Login as guest": "เข้าสู่ระบบในฐานะแขก",
"Logout": "ออกจากระบบ",
"Markdown is disabled": "ปิดใช้งาน Markdown แล้ว",
"Markdown is enabled": "เปิดใช้งาน Markdown แล้ว",

1
src/i18n/strings/tr.json
View file

@ -224,7 +224,6 @@
"Level:": "Seviye :",
"Local addresses for this room:": "Bu oda için yerel adresler :",
"Logged in as:": "Olarak giriş yaptı :",
"Login as guest": "Misafir olarak giriş yaptı",
"Logout": "Çıkış Yap",
"Low priority": "Düşük öncelikli",
"%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gelecekte oda geçmişini görünür yaptı Tüm oda üyeleri , davet edildiği noktadan.",

1
src/i18n/strings/zh_Hans.json
View file

@ -153,7 +153,6 @@
"Jump to first unread message.": "跳到第一条未读消息。",
"%(senderName)s kicked %(targetName)s.": "%(senderName)s 把 %(targetName)s 踢出了聊天室。.",
"Leave room": "退出聊天室",
"Login as guest": "以游客的身份登录",
"New password": "新密码",
"Add a topic": "添加一个主题",
"Admin": "管理员",

1
src/i18n/strings/zh_Hant.json
View file

@ -123,7 +123,6 @@
"Jump to first unread message.": "跳到第一則未讀訊息。",
"%(senderName)s kicked %(targetName)s.": "%(senderName)s 把 %(targetName)s 踢出了聊天室。.",
"Leave room": "離開聊天室",
"Login as guest": "以游客的身份登錄",
"New password": "新密碼",
"Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "重設密碼目前會把所有裝置上的端到端加密金鑰重設，讓已加密的聊天歷史不可讀，除非您先匯出您的聊天室金鑰並在稍後重新匯入。這會在未來改進。",
"Return to login screen": "返回到登入畫面",