From 5147246c175a0b55d5b978e040248b82a3b71f7b Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 26 May 2018 15:41:25 +0100 Subject: [PATCH 1/9] kill stream when using gUM for permission to device labels to kill camera Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/UserSettings.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js index c8ce79905d..4ee4f1a427 100644 --- a/src/components/structures/UserSettings.js +++ b/src/components/structures/UserSettings.js @@ -284,7 +284,12 @@ 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 + stream.getTracks().forEach((track) => track.stop()); + } + Promise.resolve().then(() => { return CallMediaHandler.getDevices(); }).then((mediaDevices) => { From e690bcb6efd58ecb85f2373949d840794bc1ab48 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Sat, 26 May 2018 20:54:19 -0600 Subject: [PATCH 2/9] Replace "Login as guest" with "Try the app first" on login page Fixes vector-im/riot-web#5875 Signed-off-by: Travis Ralston --- src/components/structures/login/Login.js | 2 +- src/i18n/strings/bg.json | 1 - src/i18n/strings/ca.json | 1 - src/i18n/strings/cs.json | 1 - src/i18n/strings/da.json | 1 - src/i18n/strings/de_DE.json | 1 - src/i18n/strings/el.json | 1 - src/i18n/strings/en_EN.json | 2 +- src/i18n/strings/en_US.json | 1 - src/i18n/strings/eo.json | 1 - src/i18n/strings/es.json | 1 - src/i18n/strings/eu.json | 1 - src/i18n/strings/fi.json | 1 - src/i18n/strings/fr.json | 1 - src/i18n/strings/gl.json | 1 - src/i18n/strings/hu.json | 1 - src/i18n/strings/id.json | 1 - src/i18n/strings/it.json | 1 - src/i18n/strings/ko.json | 1 - src/i18n/strings/lv.json | 1 - src/i18n/strings/nl.json | 1 - src/i18n/strings/pl.json | 1 - src/i18n/strings/pt.json | 1 - src/i18n/strings/pt_BR.json | 1 - src/i18n/strings/ru.json | 1 - src/i18n/strings/sk.json | 1 - src/i18n/strings/sr.json | 1 - src/i18n/strings/sv.json | 1 - src/i18n/strings/th.json | 1 - src/i18n/strings/tr.json | 1 - src/i18n/strings/zh_Hans.json | 1 - src/i18n/strings/zh_Hant.json | 1 - 32 files changed, 2 insertions(+), 32 deletions(-) diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js index 7f4aa0325a..1332f52f97 100644 --- a/src/components/structures/login/Login.js +++ b/src/components/structures/login/Login.js @@ -399,7 +399,7 @@ module.exports = React.createClass({ if (this.props.enableGuest) { loginAsGuestJsx = - { _t('Login as guest') } + { _t('Try the app first') } ; } diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json index 4911ad970e..2a7696f872 100644 --- a/src/i18n/strings/bg.json +++ b/src/i18n/strings/bg.json @@ -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 enable unsafe scripts.": "Не е възможно свързване към Home сървъра чрез HTTP, когато има HTTPS адрес в лентата на браузъра Ви. Или използвайте HTTPS или включете функция небезопасни скриптове.", - "Login as guest": "Влез като гост", "Sign in to get started": "Влезте в профила си, за да започнете", "Set a display name:": "Задаване на име:", "Upload an avatar:": "Качване на профилна снимка:", diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json index 407b9f61d4..ab4e803342 100644 --- a/src/i18n/strings/ca.json +++ b/src/i18n/strings/ca.json @@ -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", diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json index 33c7a3d5f1..441e16e2c3 100644 --- a/src/i18n/strings/cs.json +++ b/src/i18n/strings/cs.json @@ -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é)", diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json index 2a59530d5a..e10534d7f1 100644 --- a/src/i18n/strings/da.json +++ b/src/i18n/strings/da.json @@ -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", diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 4892b91b48..16ca9462b3 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -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", diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json index fabd88c74a..929ca5e7df 100644 --- a/src/i18n/strings/el.json +++ b/src/i18n/strings/el.json @@ -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:", diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index bf9e395bee..8e068d5651 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1120,7 +1120,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 enable unsafe scripts.": "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.", "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate 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:", diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json index 43e2041020..2a1b97b536 100644 --- a/src/i18n/strings/en_US.json +++ b/src/i18n/strings/en_US.json @@ -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.", diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json index 68645ffd9c..f48d10fa9f 100644 --- a/src/i18n/strings/eo.json +++ b/src/i18n/strings/eo.json @@ -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 enable unsafe scripts.": "Hejmservilo ne alkonekteblas per HTTP kun HTTPS URL en via adresbreto. Aŭ uzu HTTPS aŭ ŝaltu malsekurajn skriptojn.", "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Ne eblas konekti al hejmservilo – bonvolu kontroli vian konekton, certigi ke la SSL-atestilo de via hejmservilo 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:", diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json index 8e7925ba36..5180461828 100644 --- a/src/i18n/strings/es.json +++ b/src/i18n/strings/es.json @@ -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", diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json index 04d2e86664..9c9e5a7589 100644 --- a/src/i18n/strings/eu.json +++ b/src/i18n/strings/eu.json @@ -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.", diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json index e5787ab561..b96dbafa14 100644 --- a/src/i18n/strings/fi.json +++ b/src/i18n/strings/fi.json @@ -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", diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index dc36520506..5194dc21e7 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -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.", diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json index fdab066031..fc1adfc478 100644 --- a/src/i18n/strings/gl.json +++ b/src/i18n/strings/gl.json @@ -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 enable unsafe scripts.": "Non se pode conectar ao servidor vía HTTP cando na barra de enderezos do navegador está HTTPS. Utilice HTTPS ou active scripts non seguros.", "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate 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 certificado SSL do servidor é 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:", diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index f2aaac9a81..6012e857f5 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -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.", diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json index 9db1a4a99c..00d56e6074 100644 --- a/src/i18n/strings/id.json +++ b/src/i18n/strings/id.json @@ -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", diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json index 068ad01ff1..5ba19d1622 100644 --- a/src/i18n/strings/it.json +++ b/src/i18n/strings/it.json @@ -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 enable unsafe scripts.": "Impossibile connettersi all'homeserver via HTTP quando c'è un URL HTTPS nella barra del tuo browser. Usa HTTPS o attiva gli script non sicuri.", "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Impossibile connettersi all'homeserver - controlla la tua connessione, assicurati che il certificato SSL dell'homeserver 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:", diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json index 4e0a988223..58333f23ad 100644 --- a/src/i18n/strings/ko.json +++ b/src/i18n/strings/ko.json @@ -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님이 이후 방의 기록을 볼 수 있게 하셨어요 방 구성원 모두, 초대받은 시점부터.", diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json index 01e3ae5c6d..37cb6ec324 100644 --- a/src/i18n/strings/lv.json +++ b/src/i18n/strings/lv.json @@ -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.", diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json index 0df2cf1bd7..3e48fb9c3a 100644 --- a/src/i18n/strings/nl.json +++ b/src/i18n/strings/nl.json @@ -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 kamerleden, vanaf het moment dat ze uitgenodigt zijn.", diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json index d3dcb72f49..2ef30f7732 100644 --- a/src/i18n/strings/pl.json +++ b/src/i18n/strings/pl.json @@ -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.", diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json index d165c6c057..9b1c599501 100644 --- a/src/i18n/strings/pt.json +++ b/src/i18n/strings/pt.json @@ -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", diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json index 0a4d847805..55a503dbe7 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -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", diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index e2529ed1bc..c93b9a2e3b 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -75,7 +75,6 @@ "Kicks user with given id": "Выкидывает пользователя с заданным ID", "Labs": "Лаборатория", "Leave room": "Покинуть комнату", - "Login as guest": "Войти как гость", "Logout": "Выйти", "Low priority": "Неважные", "Manage Integrations": "Управление интеграциями", diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json index c7f38cff35..b40ba8f750 100644 --- a/src/i18n/strings/sk.json +++ b/src/i18n/strings/sk.json @@ -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 enable unsafe scripts.": "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 povolte nezabezpečené skripty.", "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate 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 certifikát domovského servera 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:", diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json index ebacd28a5c..e73107376b 100644 --- a/src/i18n/strings/sr.json +++ b/src/i18n/strings/sr.json @@ -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 enable unsafe scripts.": "Не могу да се повежем на кућни сервер преко HTTP-а када се користи HTTPS адреса у траци вашег прегледача. Или користите HTTPS или омогућите небезбедне скрипте.", "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Не могу да се повежем на кућни сервер. Проверите вашу интернет везу, постарајте се да верујете SSL сертификату кућног сервера и да проширење прегледача не блокира захтеве.", - "Login as guest": "Пријави се као гост", "Sign in to get started": "Пријави се да почнеш", "Failed to fetch avatar URL": "Нисам успео да добавим адресу аватара", "Set a display name:": "Постави приказно име:", diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json index 0f898a3374..36c858247e 100644 --- a/src/i18n/strings/sv.json +++ b/src/i18n/strings/sv.json @@ -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ågprioritet", "%(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.", diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json index 6fa7febabd..f59ae4b53b 100644 --- a/src/i18n/strings/th.json +++ b/src/i18n/strings/th.json @@ -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 แล้ว", diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json index 797fed79ce..3fb790c0d6 100644 --- a/src/i18n/strings/tr.json +++ b/src/i18n/strings/tr.json @@ -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.", diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json index 8e2dc6e0f8..cb39c1751b 100644 --- a/src/i18n/strings/zh_Hans.json +++ b/src/i18n/strings/zh_Hans.json @@ -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": "管理员", diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index 6ceda34507..bc5464d315 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -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": "返回到登入畫面", From 05357b9f8cef27502ff7ad09f6f9461c7b7685f1 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@googlemail.com> Date: Tue, 29 May 2018 12:07:56 +0100 Subject: [PATCH 3/9] improve comment --- src/components/structures/UserSettings.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js index 4ee4f1a427..d88a477932 100644 --- a/src/components/structures/UserSettings.js +++ b/src/components/structures/UserSettings.js @@ -287,6 +287,7 @@ module.exports = React.createClass({ _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()); } From 881e9a8070ea368482a59895619cb0bc23f7b8d4 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 6 Jun 2018 16:00:16 +0100 Subject: [PATCH 4/9] js-sdk rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 96c37a61c8..6722cfc3c3 100644 --- a/package.json +++ b/package.json @@ -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-rc.1", "optimist": "^0.6.1", "pako": "^1.0.5", "prop-types": "^15.5.8", From c8bf74350677f1b21e94dc1310437baa960b4eec Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 6 Jun 2018 16:06:44 +0100 Subject: [PATCH 5/9] Prepare changelog for v0.12.7-rc.1 --- CHANGELOG.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1951875ee..ae8f535cb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ +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) From 4834816a0625e0215e5f6a2bf8ba660e5f261cf1 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 6 Jun 2018 16:06:45 +0100 Subject: [PATCH 6/9] v0.12.7-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6722cfc3c3..6add75f972 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "0.12.6", + "version": "0.12.7-rc.1", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": { From 334dccbdc78597aa071762267a55447a61686dcd Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 12 Jun 2018 14:14:14 +0100 Subject: [PATCH 7/9] Released js-sdk --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index f183f1635d..bb77fcb92b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "0.12.2", + "version": "0.12.7-rc.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 6add75f972..581d25688a 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "linkifyjs": "^2.1.3", "lodash": "^4.13.1", "lolex": "2.3.2", - "matrix-js-sdk": "0.10.4-rc.1", + "matrix-js-sdk": "0.10.4", "optimist": "^0.6.1", "pako": "^1.0.5", "prop-types": "^15.5.8", From 0ad738d51044d9c92e73777d0dd79ded32118a23 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 12 Jun 2018 14:21:30 +0100 Subject: [PATCH 8/9] Prepare changelog for v0.12.7 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae8f535cb6..3b97251604 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +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) From ef1f580abbdb96446cf112f8206d776bdeb3e9c6 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 12 Jun 2018 14:21:30 +0100 Subject: [PATCH 9/9] v0.12.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 581d25688a..2984679bed 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "0.12.7-rc.1", + "version": "0.12.7", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": {