- flow.type === "m.login.password")}
/>
);
diff --git a/src/components/views/auth/CustomServerDialog.js b/src/components/views/auth/CustomServerDialog.js
deleted file mode 100644
index 138f8c4689..0000000000
--- a/src/components/views/auth/CustomServerDialog.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import { _t } from '../../../languageHandler';
-import SdkConfig from '../../../SdkConfig';
-
-export default class CustomServerDialog extends React.Component {
- render() {
- const brand = SdkConfig.get().brand;
- return (
- {this.props.submitText}
- : null;
-
- return (
- {
static defaultProps = {
- onEditServerDetailsClick: null,
onUsernameChanged: function() {},
onUsernameBlur: function() {},
onPhoneCountryChanged: function() {},
@@ -296,7 +293,7 @@ export default class PasswordLogin extends React.PureComponent {
}, {
key: "number",
test: ({ value }) => !value || PHONE_NUMBER_REGEX.test(value),
- invalid: () => _t("Doesn't look like a valid phone number"),
+ invalid: () => _t("That phone number doesn't look quite right, please check and try again"),
},
],
});
@@ -357,6 +354,7 @@ export default class PasswordLogin extends React.PureComponent {
key="username_input"
type="text"
label={_t("Username")}
+ placeholder={_t("Username").toLocaleLowerCase()}
value={this.props.username}
onChange={this.onUsernameChanged}
onFocus={this.onUsernameFocus}
@@ -410,20 +408,14 @@ export default class PasswordLogin extends React.PureComponent {
let forgotPasswordJsx;
if (this.props.onForgotPasswordClick) {
- forgotPasswordJsx =
- {_t('Not sure of your password? Set a new one', {}, {
- a: sub => (
-
- {sub}
-
- ),
- })}
- ;
+ forgotPasswordJsx =
+ {_t("Forgot password?")}
+ ;
}
const pwFieldClass = classNames({
@@ -465,8 +457,6 @@ export default class PasswordLogin extends React.PureComponent {
return (
{this.props.submitText}
- : null;
-
- return (
-
- );
- }
-}
diff --git a/src/components/views/auth/ServerTypeSelector.js b/src/components/views/auth/ServerTypeSelector.js
deleted file mode 100644
index 71e7ac7f0e..0000000000
--- a/src/components/views/auth/ServerTypeSelector.js
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
-Copyright 2019 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import { _t } from '../../../languageHandler';
-import * as sdk from '../../../index';
-import classnames from 'classnames';
-import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
-import {makeType} from "../../../utils/TypeUtils";
-
-const MODULAR_URL = 'https://element.io/matrix-services' +
- '?utm_source=element-web&utm_medium=web&utm_campaign=element-web-authentication';
-
-export const FREE = 'Free';
-export const PREMIUM = 'Premium';
-export const ADVANCED = 'Advanced';
-
-export const TYPES = {
- FREE: {
- id: FREE,
- label: () => _t('Free'),
- logo: () => })
,
- description: () => _t('Join millions for free on the largest public server'),
- serverConfig: makeType(ValidatedServerConfig, {
- hsUrl: "https://matrix-client.matrix.org",
- hsName: "matrix.org",
- hsNameIsDifferent: false,
- isUrl: "https://vector.im",
- }),
- },
- PREMIUM: {
- id: PREMIUM,
- label: () => _t('Premium'),
- logo: () => })
,
- description: () => _t('Premium hosting for organisations Learn more', {}, {
- a: sub =>
- {sub}
- ,
- }),
- identityServerUrl: "https://vector.im",
- },
- ADVANCED: {
- id: ADVANCED,
- label: () => _t('Advanced'),
- logo: () =>
- {this.props.serverConfig.hsName}
- ;
- },
- });
- }
-
- let editLink = null;
- if (this.props.onEditServerDetailsClick) {
- editLink =
- {_t('Change')}
- ;
- }
-
- return = ({
let unpinButton;
if (showUnpin) {
const onUnpinClick = () => {
- WidgetStore.instance.unpinWidget(app.id);
+ WidgetStore.instance.unpinWidget(room.roomId, app.id);
onFinished();
};
@@ -143,7 +143,7 @@ const WidgetContextMenu: React.FC = ({
let moveLeftButton;
if (showUnpin && widgetIndex > 0) {
const onClick = () => {
- WidgetStore.instance.movePinnedWidget(app.id, -1);
+ WidgetStore.instance.movePinnedWidget(roomId, app.id, -1);
onFinished();
};
@@ -153,7 +153,7 @@ const WidgetContextMenu: React.FC = ({
let moveRightButton;
if (showUnpin && widgetIndex < pinnedWidgets.length - 1) {
const onClick = () => {
- WidgetStore.instance.movePinnedWidget(app.id, 1);
+ WidgetStore.instance.movePinnedWidget(roomId, app.id, 1);
onFinished();
};
diff --git a/src/components/views/dialogs/ConfirmRedactDialog.js b/src/components/views/dialogs/ConfirmRedactDialog.js
index 3106df1d5b..2216f9a93a 100644
--- a/src/components/views/dialogs/ConfirmRedactDialog.js
+++ b/src/components/views/dialogs/ConfirmRedactDialog.js
@@ -23,15 +23,17 @@ import { _t } from '../../../languageHandler';
*/
export default class ConfirmRedactDialog extends React.Component {
render() {
- const QuestionDialog = sdk.getComponent('views.dialogs.QuestionDialog');
+ const TextInputDialog = sdk.getComponent('views.dialogs.TextInputDialog');
return (
-
-
+
);
}
}
diff --git a/src/components/views/dialogs/InfoDialog.js b/src/components/views/dialogs/InfoDialog.js
index 8125bc3edd..97ae968ff3 100644
--- a/src/components/views/dialogs/InfoDialog.js
+++ b/src/components/views/dialogs/InfoDialog.js
@@ -31,6 +31,7 @@ export default class InfoDialog extends React.Component {
onFinished: PropTypes.func,
hasCloseButton: PropTypes.bool,
onKeyDown: PropTypes.func,
+ fixedWidth: PropTypes.bool,
};
static defaultProps = {
@@ -54,6 +55,7 @@ export default class InfoDialog extends React.Component {
contentId='mx_Dialog_content'
hasCancel={this.props.hasCloseButton}
onKeyDown={this.props.onKeyDown}
+ fixedWidth={this.props.fixedWidth}
>
existing bugs on Github first. No match? Start a new one .": "Bitte wirf einen Blick auf existierende Bugs auf Github . Keinen gefunden? Erstelle einen neuen .",
+ "PRO TIP: If you start a bug, please submit debug logs to help us track down the problem.": "PRO TIPP: Wenn du einen Bug meldest, füge bitte Debug-Logs hinzu um uns zu helfen das Problem zu finden.",
+ "Invite by email": "Via Email einladen",
+ "Start a conversation with someone using their name, email address or username (like Re-request encryption keys from your other sessions.": "Volta a solicitar chaves de cifrado desde as outras sesións.",
"This message cannot be decrypted": "Esta mensaxe non pode descifrarse",
@@ -1713,7 +1713,7 @@
"Remove recent messages": "Eliminar mensaxes recentes",
"%(role)s in %(roomName)s": "%(role)s en %(roomName)s",
"Deactivate user?": "¿Desactivar usuaria?",
- "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Ao desactivar esta usuaria ficará desconectada e non poderá voltar a conectar. Ademáis deixará todas as salas nas que estivese. Esta acción non ten volta, ¿desexas desactivar esta usuaria?",
+ "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Ao desactivar esta usuaria ficará desconectada e non poderá volver a conectar. Ademáis deixará todas as salas nas que estivese. Esta acción non ten volta, ¿desexas desactivar esta usuaria?",
"Deactivate user": "Desactivar usuaria",
"Failed to deactivate user": "Fallo ao desactivar a usuaria",
"This client does not support end-to-end encryption.": "Este cliente non soporta o cifrado extremo-a-extremo.",
@@ -1864,8 +1864,8 @@
"Hide advanced": "Ocultar Avanzado",
"Show advanced": "Mostrar Avanzado",
"Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Evitar que usuarias de outros servidores matrix se unan a esta sala (Este axuste non se pode cambiar máis tarde!)",
- "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "Para evitar perder o historial da conversa, debes exportar as chaves da sala antes de desconectarte. Necesitarás voltar á nova versión de %(brand)s para facer esto",
- "You've previously used a newer version of %(brand)s with this session. To use this version again with end to end encryption, you will need to sign out and back in again.": "Xa utilizaches unha versión máis nova de %(brand)s nesta sesión. Para usar esta versión novamente con cifrado extremo-a-extremo tes que desconectarte e voltar a conectar.",
+ "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "Para evitar perder o historial da conversa, debes exportar as chaves da sala antes de desconectarte. Necesitarás volver á nova versión de %(brand)s para facer esto",
+ "You've previously used a newer version of %(brand)s with this session. To use this version again with end to end encryption, you will need to sign out and back in again.": "Xa utilizaches unha versión máis nova de %(brand)s nesta sesión. Para usar esta versión novamente con cifrado extremo-a-extremo tes que desconectarte e volver a conectar.",
"Incompatible Database": "Base de datos non compatible",
"Continue With Encryption Disabled": "Continuar con Cifrado Desactivado",
"Are you sure you want to deactivate your account? This is irreversible.": "¿Tes a certeza de querer desactivar a túa conta? Esto é irreversible.",
@@ -1918,7 +1918,7 @@
"The authenticity of this encrypted message can't be guaranteed on this device.": "A autenticidade desta mensaxe cifrada non está garantida neste dispositivo.",
"Signature upload success": "Subeuse correctamente a sinatura",
"Signature upload failed": "Fallou a subida da sinatura",
- "You've previously used %(brand)s on %(host)s with lazy loading of members enabled. In this version lazy loading is disabled. As the local cache is not compatible between these two settings, %(brand)s needs to resync your account.": "Anteriormente utilizaches %(brand)s en %(host)s con carga preguiceira de membros. Nesta versión a carga preguiceira está desactivada. Como a caché local non é compatible entre as dúas configuracións, %(brand)s precisa voltar a sincronizar a conta.",
+ "You've previously used %(brand)s on %(host)s with lazy loading of members enabled. In this version lazy loading is disabled. As the local cache is not compatible between these two settings, %(brand)s needs to resync your account.": "Anteriormente utilizaches %(brand)s en %(host)s con carga preguiceira de membros. Nesta versión a carga preguiceira está desactivada. Como a caché local non é compatible entre as dúas configuracións, %(brand)s precisa volver a sincronizar a conta.",
"Incompatible local cache": "Caché local incompatible",
"Clear cache and resync": "Baleirar caché e sincronizar",
"%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "%(brand)s utiliza agora entre 3 e 5 veces menos memoria, cargando só información sobre as usuarias cando é preciso. Agarda mentras se sincroniza co servidor!",
@@ -2079,7 +2079,7 @@
"Premium hosting for organisations Learn more": "Hospedaxe Premium para organizacións Saber máis",
"Find other public servers or use a custom server": "Atopa outros servidores públicos ou usa un servidor personalizado",
"Couldn't load page": "Non se puido cargar a páxina",
- "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Administras esta comunidade. Non poderás voltar a unirte sen un convite doutra persoa administradora.",
+ "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Administras esta comunidade. Non poderás volver a unirte sen un convite doutra persoa administradora.",
"Want more than a community? Get your own server": "¿Queres algo máis que unha comunidade? Monta o teu propio servidor",
"This homeserver does not support communities": "Este servidor non soporta comunidades",
"Welcome to %(appName)s": "Benvida a %(appName)s",
@@ -2845,5 +2845,87 @@
"Filter rooms and people": "Fitrar salas e persoas",
"Open the link in the email to continue registration.": "Abre a ligazón que hai no email para continuar co rexistro.",
"A confirmation email has been sent to %(emailAddress)s": "Enviouse un email de confirmación a %(emailAddress)s",
- "Start a new chat": "Comezar nova conversa"
+ "Start a new chat": "Comezar nova conversa",
+ "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Conservar na memoria local as mensaxes cifradas de xeito seguro para que aparezan nas buscas, usando %(size)s para gardar mensaxes de %(rooms)s salas.",
+ "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Conservar na memoria local as mensaxes cifradas de xeito seguro para que aparezan nas buscas, usando %(size)s para gardar mensaxes de %(rooms)s salas.",
+ "Go to Home View": "Ir á Páxina de Inicio",
+ "anonymous usage data which helps us improve %(brand)s. This will use a cookie .": "Wysyłaj anonimowe dane o wykorzystywaniu , które pomogą nam usprawnić %(brand)s. To będzie korzystać z pliku cookie .",
+ "Help us improve %(brand)s": "Pomóż nam usprawnić %(brand)s",
+ "Unknown App": "Nieznana aplikacja",
+ "Enable desktop notifications": "Włącz powiadomienia na pulpicie",
+ "Don't miss a reply": "Nie przegap odpowiedzi",
+ "A session's public name is visible to people you communicate with": "Publiczna nazwa sesji jest widoczna dla osób z którymi się komunikujesz",
+ "Manage the names of and sign out of your sessions below or verify them in your User Profile.": "Zarządzaj nazwami i unieważnaj sesje poniżej, lub weryfikuj je na swoim profilu.",
+ "Where you’re logged in": "Gdzie jesteś zalogowany(-a)",
+ "Review where you’re logged in": "Przejrzyj, gdzie jesteś zalogowany(-a)",
+ "Show tray icon and minimize window to it on close": "Pokazuj ikonę w zasobniku i minimalizuj okno do zasobnika przy zamknięciu",
+ "Display your community flair in rooms configured to show it.": "Wyświetlaj swój wyróżnik społeczności w pokojach skonfigurowanych, aby go używać.",
+ "System font name": "Nazwa czcionki systemowej",
+ "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Wybierz nazwę czcionki zainstalowanej w systemie, a %(brand)s spróbuje jej użyć.",
+ "Use a system font": "Użyj czcionki systemowej",
+ "Enable experimental, compact IRC style layout": "Włącz eksperymentalny, kompaktowy układ w stylu IRC",
+ "Use a more compact ‘Modern’ layout": "Użyj bardziej kompaktowego „nowoczesnego” układu",
+ "Use custom size": "Użyj niestandardowego rozmiaru",
+ "Appearance Settings only affect this %(brand)s session.": "Ustawienia wyglądu wpływają tylko na tę sesję %(brand)s.",
+ "Customise your appearance": "Dostosuj wygląd",
+ "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Użyj Zarządcy Integracji aby zarządzać botami, widżetami i pakietami naklejek.",
+ "Use an Integration Manager (%(serverName)s) to manage bots, widgets, and sticker packs.": "Użyj Zarządcy Integracji %(serverName)s aby zarządzać botami, widżetami i pakietami naklejek.",
+ "There are two ways you can provide feedback and help us improve %(brand)s.": "Są dwa sposoby na przekazanie informacji zwrotnych i pomoc w usprawnieniu %(brand)s.",
+ "Feedback sent": "Wysłano informacje zwrotne",
+ "Send feedback": "Wyślij informacje zwrotne",
+ "Feedback": "Informacje zwrotne",
+ "You have no visible notifications in this room.": "Nie masz widocznych powiadomień w tym pokoju.",
+ "%(creator)s created this DM.": "%(creator)s utworzył(a) tę wiadomość bezpośrednią.",
+ "You do not have permission to create rooms in this community.": "Nie masz uprawnień do tworzenia pokojów w tej społeczności.",
+ "Cannot create rooms in this community": "Nie można utworzyć pokojów w tej społeczności",
+ "Liberate your communication": "Uwolnij swoją komunikację",
+ "Welcome to %(appName)s": "Witamy w %(appName)s",
+ "Now, let's help you get started": "Teraz pomożemy Ci zacząć",
+ "Welcome %(name)s": "Witaj, %(name)s",
+ "Israel": "Izrael",
+ "Isle of Man": "Man",
+ "Ireland": "Irlandia",
+ "Iraq": "Irak",
+ "Iran": "Iran",
+ "Indonesia": "Indonezja",
+ "India": "Indie",
+ "Iceland": "Islandia",
+ "Hungary": "Węgry",
+ "Hong Kong": "Hong Kong",
+ "Honduras": "Honduras",
+ "Heard & McDonald Islands": "Wyspy Heard i McDonald",
+ "Haiti": "Haiti",
+ "Guyana": "Gujana",
+ "Guinea-Bissau": "Gwinea Bissau",
+ "Guinea": "Gwinea",
+ "Guernsey": "Guernsey",
+ "Guatemala": "Gwatemala",
+ "Guam": "Guam",
+ "Guadeloupe": "Gwadelupa",
+ "Grenada": "Grenada",
+ "Greenland": "Grenlandia",
+ "Greece": "Grecja",
+ "Gibraltar": "Gibraltar",
+ "Ghana": "Ghana",
+ "Germany": "Niemcy",
+ "Georgia": "Gruzja",
+ "Gambia": "Gambia",
+ "Gabon": "Gabon",
+ "French Southern Territories": "Francuskie Terytoria Południowe i Antarktyczne",
+ "French Polynesia": "Polinezja Francuska",
+ "French Guiana": "Gujana Francuska",
+ "France": "Francja",
+ "Finland": "Finlandia",
+ "Fiji": "Fidżi",
+ "Faroe Islands": "Wyspy Owcze",
+ "Falkland Islands": "Falklandy",
+ "Ethiopia": "Etiopia",
+ "Estonia": "Estonia",
+ "Eritrea": "Erytrea",
+ "Equatorial Guinea": "Gwinea Równikowa",
+ "El Salvador": "Salwador",
+ "Egypt": "Egipt",
+ "Ecuador": "Ekwador",
+ "Dominican Republic": "Dominikana",
+ "Dominica": "Dominika",
+ "Djibouti": "Dżibuti",
+ "Denmark": "Dania",
+ "Côte d’Ivoire": "Wybrzeże Kości Słoniowej",
+ "Czech Republic": "Czechy",
+ "Cyprus": "Cypr",
+ "Curaçao": "Curaçao",
+ "Cuba": "Kuba",
+ "Croatia": "Chorwacja",
+ "Costa Rica": "Kostaryka",
+ "Cook Islands": "Wyspy Cooka",
+ "Congo - Kinshasa": "Kinszasa",
+ "Congo - Brazzaville": "Kongo",
+ "Comoros": "Komory",
+ "Colombia": "Kolumbia",
+ "Cocos (Keeling) Islands": "Wyspy Kokosowe",
+ "Christmas Island": "Wyspa Bożego Narodzenia",
+ "China": "Chiny",
+ "Chile": "Chile",
+ "Chad": "Czad",
+ "Central African Republic": "Republika Środkowoafrykańska",
+ "Cayman Islands": "Kajmany",
+ "Caribbean Netherlands": "Holandia Karaibska",
+ "Cape Verde": "Republika Zielonego Przylądka",
+ "Canada": "Kanada",
+ "Cameroon": "Kamerun",
+ "Cambodia": "Kambodża",
+ "Burundi": "Burundi",
+ "Burkina Faso": "Burkina Faso",
+ "Bulgaria": "Bułgaria",
+ "Brunei": "Brunei",
+ "British Virgin Islands": "Brytyjskie Wyspy Dziewicze",
+ "British Indian Ocean Territory": "Brytyjskie Terytorium Oceanu Indyjskiego",
+ "Brazil": "Brazylia",
+ "Bouvet Island": "Wyspa Bouveta",
+ "Botswana": "Botswana",
+ "Bosnia": "Bośnia",
+ "Bolivia": "Boliwia",
+ "Bhutan": "Bhutan",
+ "Bermuda": "Bermudy",
+ "Benin": "Benin",
+ "Belize": "Belize",
+ "Belgium": "Belgia",
+ "Belarus": "Białoruś",
+ "Barbados": "Barbados",
+ "Bangladesh": "Bangladesz",
+ "Bahrain": "Bahrajn",
+ "Bahamas": "Bahamy",
+ "Azerbaijan": "Azerbejdżan",
+ "Austria": "Austria",
+ "Australia": "Australia",
+ "Aruba": "Aruba",
+ "Armenia": "Armenia",
+ "Argentina": "Argentyna",
+ "Antigua & Barbuda": "Antigua i Barbuda",
+ "Antarctica": "Antarktyda",
+ "Anguilla": "Anguilla",
+ "Angola": "Angola",
+ "Andorra": "Andora",
+ "American Samoa": "Samoa Amerykańskie",
+ "Algeria": "Algeria",
+ "Albania": "Albania",
+ "Åland Islands": "Wyspy Alandzkie",
+ "Afghanistan": "Afganistan",
+ "United States": "Stany Zjednoczone",
+ "United Kingdom": "Wielka Brytania",
+ "Marshall Islands": "Wyspy Marshalla",
+ "Malta": "Malta",
+ "Mali": "Mali",
+ "Maldives": "Malediwy",
+ "Malaysia": "Malezja",
+ "Malawi": "Malawi",
+ "Madagascar": "Madagaskar",
+ "Macedonia": "Macedonia",
+ "Macau": "Makau",
+ "Luxembourg": "Luksemburg",
+ "Lithuania": "Litwa",
+ "Liechtenstein": "Liechtenstein",
+ "Libya": "Libia",
+ "Liberia": "Liberia",
+ "Lesotho": "Lesotho",
+ "Lebanon": "Liban",
+ "Latvia": "Łotwa",
+ "Laos": "Laos",
+ "Kyrgyzstan": "Kirgistan",
+ "Kuwait": "Kuwejt",
+ "Kosovo": "Kosowo",
+ "Kiribati": "Kiribati",
+ "Kenya": "Kenia",
+ "Kazakhstan": "Kazachstan",
+ "Jordan": "Jordania",
+ "Jersey": "Jersey",
+ "User rules": "Zasady użytkownika",
+ "Server rules": "Zasady serwera",
+ "not found": "nie znaleziono",
+ "Decline (%(counter)s)": "Odrzuć (%(counter)s)",
+ "Starting backup...": "Rozpoczynanie kopii zapasowej…",
+ "User Autocomplete": "Autouzupełnianie użytkowników",
+ "Community Autocomplete": "Autouzupełnianie społeczności",
+ "Room Autocomplete": "Autouzupełnianie pokojów",
+ "Notification Autocomplete": "Autouzupełnianie powiadomień",
+ "Emoji Autocomplete": "Autouzupełnianie emoji",
+ "Phone (optional)": "Telefon (opcjonalny)",
+ "Upload Error": "Błąd wysyłania",
+ "GitHub issue": "Błąd na GitHubie",
+ "Close dialog": "Zamknij okno dialogowe",
+ "Show all": "Zobacz wszystko",
+ "Deactivate user": "Dezaktywuj użytkownika",
+ "Deactivate user?": "Dezaktywować użytkownika?",
+ "Revoke invite": "Wygaś zaproszenie",
+ "Code block": "Blok kodu",
+ "Ban users": "Zablokuj użytkowników",
+ "Kick users": "Wyrzuć użytkowników",
+ "Syncing...": "Synchronizacja…",
+ "General failure": "Ogólny błąd",
+ "Removing…": "Usuwanie…",
+ "Premium": "Premium",
+ "Cancelling…": "Anulowanie…",
+ "Algorithm:": "Algorytm:",
+ "Bulk options": "Masowe działania",
+ "Modern": "Współczesny",
+ "Compact": "Kompaktowy",
+ "Approve": "Zatwierdź",
+ "Incompatible Database": "Niekompatybilna baza danych",
+ "Show": "Pokaż",
+ "Information": "Informacje",
+ "Categories": "Kategorie",
+ "Reactions": "Reakcje",
+ "Role": "Rola",
+ "Trusted": "Zaufane",
+ "Accepting…": "Akceptowanie…",
+ "Re-join": "Dołącz ponownie",
+ "Unencrypted": "Nieszyfrowane",
+ "Revoke": "Unieważnij",
+ "Encrypted": "Szyfrowane",
+ "Unsubscribe": "Odsubskrybuj",
+ "None": "Brak",
+ "exists": "istnieje",
+ "Change the topic of this room": "Zmień temat tego pokoju",
+ "Change which room you're viewing": "Zmień pokój który przeglądasz",
+ "Send stickers into your active room": "Wyślij naklejki w swoim aktywnym pokoju",
+ "Send stickers into this room": "Wyślij naklejki w tym pokoju",
+ "Zimbabwe": "Zimbabwe",
+ "Zambia": "Zambia",
+ "Yemen": "Jemen",
+ "Western Sahara": "Sahara Zachodnia",
+ "Wallis & Futuna": "Wallis i Futuna",
+ "Vietnam": "Wietnam",
+ "Venezuela": "Wenezuela",
+ "Vatican City": "Watykan",
+ "Vanuatu": "Vanuatu",
+ "Uzbekistan": "Uzbekistan",
+ "Uruguay": "Urugwaj",
+ "United Arab Emirates": "Zjednoczone Emiraty Arabskie",
+ "Ukraine": "Ukraina",
+ "Uganda": "Uganda",
+ "U.S. Virgin Islands": "Wyspy Dziewicze Stanów Zjednoczonych",
+ "Tuvalu": "Tuvalu",
+ "Turks & Caicos Islands": "Turks i Caicos",
+ "Turkmenistan": "Turkmenistan",
+ "Turkey": "Turcja",
+ "Tunisia": "Tunezja",
+ "Trinidad & Tobago": "Trynidad i Tobago",
+ "Tonga": "Tonga",
+ "Tokelau": "Tokelau",
+ "Togo": "Togo",
+ "Timor-Leste": "Timor Wschodni",
+ "Thailand": "Tajlandia",
+ "Tanzania": "Tanzania",
+ "Tajikistan": "Tadżykistan",
+ "Taiwan": "Tajwan",
+ "São Tomé & Príncipe": "Wyspy Świętego Tomasza i Książęca",
+ "Syria": "Syria",
+ "Switzerland": "Szwajcaria",
+ "Sweden": "Szwecja",
+ "Swaziland": "Eswatini",
+ "Svalbard & Jan Mayen": "Svalbard i Jan Mayen",
+ "Suriname": "Surinam",
+ "Sudan": "Sudan",
+ "St. Vincent & Grenadines": "Saint Vincent i Grenadyny",
+ "St. Pierre & Miquelon": "Saint-Pierre i Miquelon",
+ "St. Martin": "Sint Maarten",
+ "St. Lucia": "Saint Lucia",
+ "St. Kitts & Nevis": "Saint Kitts & Nevis",
+ "St. Helena": "Święta Helena",
+ "St. Barthélemy": "Wspólnota Saint-Barthélemy",
+ "Sri Lanka": "Sri Lanka",
+ "Spain": "Hiszpania",
+ "South Sudan": "Sudan Południowy",
+ "South Korea": "Korea Południowa",
+ "South Georgia & South Sandwich Islands": "Georgia Południowa i Sandwich Południowy",
+ "South Africa": "Republika Południowej Afryki",
+ "Somalia": "Somalia",
+ "Solomon Islands": "Wyspy Salomona",
+ "Slovenia": "Słowenia",
+ "Slovakia": "Słowacja",
+ "Sint Maarten": "Sint Maarten",
+ "Singapore": "Singapur",
+ "Sierra Leone": "Sierra Leone",
+ "Seychelles": "Seszele",
+ "Serbia": "Serbia",
+ "Senegal": "Senegal",
+ "Saudi Arabia": "Arabia Saudyjska",
+ "San Marino": "San Marino",
+ "Samoa": "Samoa",
+ "Réunion": "Reunion",
+ "Rwanda": "Rwanda",
+ "Russia": "Rosja",
+ "Romania": "Rumunia",
+ "Qatar": "Katar",
+ "Puerto Rico": "Portoryko",
+ "Portugal": "Portugalia",
+ "Poland": "Polska",
+ "Pitcairn Islands": "Pitcairn",
+ "Philippines": "Filipiny",
+ "Peru": "Peru",
+ "Paraguay": "Paragwaj",
+ "Papua New Guinea": "Papua Nowa Gwinea",
+ "Panama": "Panama",
+ "Palestine": "Palestyna",
+ "Palau": "Palau",
+ "Pakistan": "Pakistan",
+ "Oman": "Oman",
+ "Norway": "Norwegia",
+ "Northern Mariana Islands": "Mariany Północne",
+ "North Korea": "Korea Północna",
+ "Norfolk Island": "Norfolk",
+ "Niue": "Niue",
+ "Nigeria": "Nigeria",
+ "Niger": "Niger",
+ "Nicaragua": "Nikaragua",
+ "New Zealand": "Nowa Zelandia",
+ "New Caledonia": "Nowa Kaledonia",
+ "Netherlands": "Holandia",
+ "Nepal": "Nepal",
+ "Nauru": "Nauru",
+ "Namibia": "Namibia",
+ "Myanmar": "Mjanma",
+ "Mozambique": "Mozambik",
+ "Morocco": "Maroko",
+ "Montserrat": "Montserrat",
+ "Montenegro": "Czarnogóra",
+ "Mongolia": "Mongolia",
+ "Monaco": "Monako",
+ "Moldova": "Mołdawia",
+ "Micronesia": "Mikronezja",
+ "Mexico": "Meksyk",
+ "Mayotte": "Majotta",
+ "Mauritius": "Mauritius",
+ "Mauritania": "Mauretania",
+ "Martinique": "Martynika"
}
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index aa4bfc41ca..613f889370 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -501,7 +501,7 @@
"Visibility in Room List": "Visibilidade na lista de salas",
"Visible to everyone": "Visível para todos",
"Only visible to community members": "Apenas visível para participantes da comunidade",
- "Filter community rooms": "Filtrar salas da comunidade",
+ "Filter community rooms": "Pesquisar salas da comunidade",
"Something went wrong when trying to get your communities.": "Não foi possível carregar suas comunidades.",
"Display your community flair in rooms configured to show it.": "Mostrar o ícone da sua comunidade nas salas que o permitem.",
"You're not currently a member of any communities.": "No momento, você não é participante de nenhuma comunidade.",
@@ -2772,5 +2772,92 @@
"Uzbekistan": "Uzbequistão",
"Role": "Função",
"Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "Armazene localmente com segurança as mensagens criptografadas para que apareçam nos resultados da pesquisa, usando %(size)s para armazenar mensagens de %(count)s sala.",
- "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Armazene localmente com segurança as mensagens criptografadas para que apareçam nos resultados da pesquisa, usando %(size)s para armazenar mensagens de %(count)s salas."
+ "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Armazene localmente com segurança as mensagens criptografadas para que apareçam nos resultados da pesquisa, usando %(size)s para armazenar mensagens de %(count)s salas.",
+ "Filter": "Pesquisar",
+ "Start a new chat": "Iniciar uma nova conversa",
+ "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Armazene mensagens criptografadas de forma segura localmente para que apareçam nos resultados das buscas. %(size)s é necessário para armazenar mensagens de %(rooms)s sala.",
+ "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Armazene mensagens criptografadas de forma segura localmente para que apareçam nos resultados das buscas. %(size)s é necessário para armazenar mensagens de %(rooms)s salas.",
+ "Filter rooms and people": "Pesquisar salas e pessoas",
+ "Open the link in the email to continue registration.": "Abra o link no e-mail para continuar o registro.",
+ "A confirmation email has been sent to %(emailAddress)s": "Um e-mail de confirmação foi enviado para %(emailAddress)s",
+ "Go to Home View": "Ir para a tela inicial",
+ ";
+
interface IRoomWidgets {
widgets: IApp[];
- pinned: Record;
+ pinned: PinnedWidgets;
}
export const MAX_PINNED = 3;
+function widgetUid(app: IApp): string {
+ return `${app.roomId ?? MatrixClientPeg.get().getUserId()}::${app.id}`;
+}
+
// TODO consolidate WidgetEchoStore into this
// TODO consolidate ActiveWidgetStore into this
export default class WidgetStore extends AsyncStoreWithClient {
private static internalInstance = new WidgetStore();
- private widgetMap = new Map();
- private roomMap = new Map();
+ private widgetMap = new Map(); // Key is widget Unique ID (UID)
+ private roomMap = new Map(); // Key is room ID
private constructor() {
super(defaultDispatcher, {});
@@ -126,13 +134,20 @@ export default class WidgetStore extends AsyncStoreWithClient {
// first clean out old widgets from the map which originate from this room
// otherwise we are out of sync with the rest of the app with stale widget events during removal
Array.from(this.widgetMap.values()).forEach(app => {
- if (app.roomId === room.roomId) {
- this.widgetMap.delete(app.id);
- }
+ this.widgetMap.delete(widgetUid(app));
});
this.generateApps(room).forEach(app => {
- this.widgetMap.set(app.id, app);
+ // Sanity check for https://github.com/vector-im/element-web/issues/15705
+ const existingApp = this.widgetMap.get(widgetUid(app));
+ if (existingApp) {
+ console.warn(
+ `Possible widget ID conflict for ${app.id} - wants to store in room ${app.roomId} ` +
+ `but is currently stored as ${existingApp.roomId} - letting the want win`,
+ );
+ }
+
+ this.widgetMap.set(widgetUid(app), app);
roomInfo.widgets.push(app);
});
this.emit(room.roomId);
@@ -146,61 +161,68 @@ export default class WidgetStore extends AsyncStoreWithClient {
this.emit(UPDATE_EVENT);
};
- public getRoomId = (widgetId: string) => {
- const app = this.widgetMap.get(widgetId);
- if (!app) return null;
- return app.roomId;
- }
-
public getRoom = (roomId: string) => {
return this.roomMap.get(roomId);
};
private onPinnedWidgetsChange = (settingName: string, roomId: string) => {
this.initRoom(roomId);
- this.getRoom(roomId).pinned = SettingsStore.getValue(settingName, roomId);
+
+ const pinned: PinnedWidgets = SettingsStore.getValue(settingName, roomId);
+
+ // Sanity check for https://github.com/vector-im/element-web/issues/15705
+ const roomInfo = this.getRoom(roomId);
+ const remappedPinned: PinnedWidgets = {};
+ for (const widgetId of Object.keys(pinned)) {
+ const isPinned = pinned[widgetId];
+ if (!roomInfo.widgets?.some(w => w.id === widgetId)) {
+ console.warn(`Skipping pinned widget update for ${widgetId} in ${roomId} -- wrong room`);
+ } else {
+ remappedPinned[widgetId] = isPinned;
+ }
+ }
+ roomInfo.pinned = remappedPinned;
+
this.emit(roomId);
this.emit(UPDATE_EVENT);
};
- public isPinned(widgetId: string) {
- const roomId = this.getRoomId(widgetId);
+ public isPinned(roomId: string, widgetId: string) {
return !!this.getPinnedApps(roomId).find(w => w.id === widgetId);
}
- public canPin(widgetId: string) {
- const roomId = this.getRoomId(widgetId);
+ // dev note: we don't need the widgetId on this function, but the contract makes more sense
+ // when we require it.
+ public canPin(roomId: string, widgetId: string) {
return this.getPinnedApps(roomId).length < MAX_PINNED;
}
- public pinWidget(widgetId: string) {
- const roomId = this.getRoomId(widgetId);
+ public pinWidget(roomId: string, widgetId: string) {
const roomInfo = this.getRoom(roomId);
if (!roomInfo) return;
// When pinning, first confirm all the widgets (Jitsi) which were autopinned so that the order is correct
const autoPinned = this.getPinnedApps(roomId).filter(app => !roomInfo.pinned[app.id]);
autoPinned.forEach(app => {
- this.setPinned(app.id, true);
+ this.setPinned(roomId, app.id, true);
});
- this.setPinned(widgetId, true);
+ this.setPinned(roomId, widgetId, true);
// Show the apps drawer upon the user pinning a widget
- if (RoomViewStore.getRoomId() === this.getRoomId(widgetId)) {
+ if (RoomViewStore.getRoomId() === roomId) {
defaultDispatcher.dispatch({
action: "appsDrawer",
show: true,
- })
+ });
}
}
- public unpinWidget(widgetId: string) {
- this.setPinned(widgetId, false);
+ public unpinWidget(roomId: string, widgetId: string) {
+ this.setPinned(roomId, widgetId, false);
}
- private setPinned(widgetId: string, value: boolean) {
- const roomId = this.getRoomId(widgetId);
+ private setPinned(roomId: string, widgetId: string, value: boolean) {
const roomInfo = this.getRoom(roomId);
if (!roomInfo) return;
if (roomInfo.pinned[widgetId] === false && value) {
@@ -221,9 +243,8 @@ export default class WidgetStore extends AsyncStoreWithClient {
this.emit(UPDATE_EVENT);
}
- public movePinnedWidget(widgetId: string, delta: 1 | -1) {
+ public movePinnedWidget(roomId: string, widgetId: string, delta: 1 | -1) {
// TODO simplify this by changing the storage medium of pinned to an array once the Jitsi default-on goes away
- const roomId = this.getRoomId(widgetId);
const roomInfo = this.getRoom(roomId);
if (!roomInfo || roomInfo.pinned[widgetId] === false) return;
@@ -264,12 +285,33 @@ export default class WidgetStore extends AsyncStoreWithClient {
});
const order = Object.keys(roomInfo.pinned).filter(k => roomInfo.pinned[k]);
- let apps = order.map(wId => this.widgetMap.get(wId)).filter(Boolean);
- apps = apps.slice(0, priorityWidget ? MAX_PINNED - 1 : MAX_PINNED);
+ const apps = order
+ .map(wId => Array.from(this.widgetMap.values())
+ .find(w2 => w2.roomId === roomId && w2.id === wId))
+ .filter(Boolean)
+ .slice(0, priorityWidget ? MAX_PINNED - 1 : MAX_PINNED);
if (priorityWidget) {
apps.push(priorityWidget);
}
+ // Sanity check for https://github.com/vector-im/element-web/issues/15705
+ // We union the app IDs the above generated with the roomInfo's known widgets to
+ // get a list of IDs which both exist. We then diff that against the generated app
+ // IDs above to ensure that all of the app IDs are captured by the union with the
+ // room - if we grabbed a widget that wasn't part of the roomInfo's list, it wouldn't
+ // be in the union and thus result in a diff.
+ const appIds = apps.map(a => widgetUid(a));
+ const roomAppIds = roomInfo.widgets.map(a => widgetUid(a));
+ const roomAppIdsUnion = arrayUnion(appIds, roomAppIds);
+ const missingSomeApps = arrayHasDiff(roomAppIdsUnion, appIds);
+ if (missingSomeApps) {
+ const diff = arrayDiff(roomAppIdsUnion, appIds);
+ console.warn(
+ `${roomId} appears to have a conflict for which widgets belong to it. ` +
+ `Widget UIDs are: `, [...diff.added, ...diff.removed],
+ );
+ }
+
return apps;
}
diff --git a/src/utils/membership.ts b/src/utils/membership.ts
index 696bd57880..80f04dfe76 100644
--- a/src/utils/membership.ts
+++ b/src/utils/membership.ts
@@ -140,6 +140,6 @@ export async function leaveRoomBehaviour(roomId: string) {
}
if (RoomViewStore.getRoomId() === roomId) {
- dis.dispatch({action: 'view_next_room'});
+ dis.dispatch({action: 'view_home_page'});
}
}
diff --git a/test/components/structures/auth/Login-test.js b/test/components/structures/auth/Login-test.js
index 7ca210ff93..0631e26cbd 100644
--- a/test/components/structures/auth/Login-test.js
+++ b/test/components/structures/auth/Login-test.js
@@ -52,7 +52,7 @@ describe('Login', function() {
// Set non-empty flows & matrixClient to get past the loading spinner
root.setState({
- currentFlow: "m.login.password",
+ flows: [{ type: "m.login.password" }],
});
const form = ReactTestUtils.findRenderedComponentWithType(
@@ -61,10 +61,7 @@ describe('Login', function() {
);
expect(form).toBeTruthy();
- const changeServerLink = ReactTestUtils.findRenderedDOMComponentWithClass(
- root,
- 'mx_AuthBody_editServerDetails',
- );
+ const changeServerLink = ReactTestUtils.findRenderedDOMComponentWithClass(root, 'mx_ServerPicker_change');
expect(changeServerLink).toBeTruthy();
});
@@ -77,7 +74,7 @@ describe('Login', function() {
// Set non-empty flows & matrixClient to get past the loading spinner
root.setState({
- currentFlow: "m.login.password",
+ flows: [{ type: "m.login.password" }],
});
const form = ReactTestUtils.findRenderedComponentWithType(
@@ -86,10 +83,70 @@ describe('Login', function() {
);
expect(form).toBeTruthy();
- const changeServerLinks = ReactTestUtils.scryRenderedDOMComponentsWithClass(
- root,
- 'mx_AuthBody_editServerDetails',
- );
+ const changeServerLinks = ReactTestUtils.scryRenderedDOMComponentsWithClass(root, 'mx_ServerPicker_change');
expect(changeServerLinks).toHaveLength(0);
});
+
+ it("should show SSO button if that flow is available", () => {
+ jest.spyOn(SdkConfig, "get").mockReturnValue({
+ disable_custom_urls: true,
+ });
+
+ const root = render();
+
+ // Set non-empty flows & matrixClient to get past the loading spinner
+ root.setState({
+ flows: [{ type: "m.login.sso" }],
+ });
+
+ const ssoButton = ReactTestUtils.findRenderedDOMComponentWithClass(root, "mx_SSOButton");
+ expect(ssoButton).toBeTruthy();
+ });
+
+ it("should show both SSO button and username+password if both are available", () => {
+ jest.spyOn(SdkConfig, "get").mockReturnValue({
+ disable_custom_urls: true,
+ });
+
+ const root = render();
+
+ // Set non-empty flows & matrixClient to get past the loading spinner
+ root.setState({
+ flows: [{ type: "m.login.password" }, { type: "m.login.sso" }],
+ });
+
+ const form = ReactTestUtils.findRenderedComponentWithType(root, sdk.getComponent('auth.PasswordLogin'));
+ expect(form).toBeTruthy();
+
+ const ssoButton = ReactTestUtils.findRenderedDOMComponentWithClass(root, "mx_SSOButton");
+ expect(ssoButton).toBeTruthy();
+ });
+
+ it("should show multiple SSO buttons if multiple identity_providers are available", () => {
+ jest.spyOn(SdkConfig, "get").mockReturnValue({
+ disable_custom_urls: true,
+ });
+
+ const root = render();
+
+ // Set non-empty flows & matrixClient to get past the loading spinner
+ root.setState({
+ flows: [{
+ type: "m.login.sso",
+ identity_providers: [{
+ id: "a",
+ name: "Provider 1",
+ }, {
+ id: "b",
+ name: "Provider 2",
+ }, {
+ id: "c",
+ name: "Provider 3",
+ }],
+ }],
+ });
+
+ const ssoButtons = ReactTestUtils.scryRenderedDOMComponentsWithClass(root, "mx_SSOButton");
+ expect(ssoButtons.length).toBe(3);
+ });
});
diff --git a/test/components/structures/auth/Registration-test.js b/test/components/structures/auth/Registration-test.js
index bf26763a79..3e8e887329 100644
--- a/test/components/structures/auth/Registration-test.js
+++ b/test/components/structures/auth/Registration-test.js
@@ -48,12 +48,9 @@ describe('Registration', function() {
/>, parentDiv);
}
- it('should show server type selector', function() {
+ it('should show server picker', function() {
const root = render();
- const selector = ReactTestUtils.findRenderedComponentWithType(
- root,
- sdk.getComponent('auth.ServerTypeSelector'),
- );
+ const selector = ReactTestUtils.findRenderedDOMComponentWithClass(root, "mx_ServerPicker");
expect(selector).toBeTruthy();
});
@@ -79,4 +76,27 @@ describe('Registration', function() {
);
expect(form).toBeTruthy();
});
+
+ it("should show SSO options if those are available", () => {
+ jest.spyOn(SdkConfig, "get").mockReturnValue({
+ disable_custom_urls: true,
+ });
+
+ const root = render();
+
+ // Set non-empty flows & matrixClient to get past the loading spinner
+ root.setState({
+ flows: [{
+ stages: [],
+ }],
+ ssoFlow: {
+ type: "m.login.sso",
+ },
+ matrixClient: {},
+ busy: false,
+ });
+
+ const ssoButton = ReactTestUtils.findRenderedDOMComponentWithClass(root, "mx_SSOButton");
+ expect(ssoButton).toBeTruthy();
+ });
});
diff --git a/test/end-to-end-tests/.gitignore b/test/end-to-end-tests/.gitignore
index afca1ddcb3..61f9012393 100644
--- a/test/end-to-end-tests/.gitignore
+++ b/test/end-to-end-tests/.gitignore
@@ -1,3 +1,3 @@
node_modules
*.png
-riot/env
+element/env
diff --git a/test/end-to-end-tests/README.md b/test/end-to-end-tests/README.md
index 8794ef6c9b..b173fb86c2 100644
--- a/test/end-to-end-tests/README.md
+++ b/test/end-to-end-tests/README.md
@@ -5,9 +5,9 @@ This directory contains tests for matrix-react-sdk. The tests fire up a headless
## Setup
Run `./install.sh`. This will:
- - install Synapse, fetches the master branch at the moment. If anything fails here, please refer to the Synapse README to see if you're missing one of the prerequisites.
- - install Riot, this fetches the master branch at the moment.
- - install dependencies (will download copy of chrome)
+ - install Synapse, fetches the develop branch at the moment. If anything fails here, please refer to the Synapse README to see if you're missing one of the prerequisites.
+ - install Element Web, this fetches the develop branch at the moment.
+ - install dependencies (will download copy of Chrome)
## Running the tests
@@ -15,7 +15,7 @@ Run tests with `./run.sh`.
### Debug tests locally.
-`./run.sh` will run the tests against the Riot copy present in `riot/riot-web` served by a static Python HTTP server. You can symlink your `riot-web` develop copy here but that doesn't work well with Webpack recompiling. You can run the test runner directly and specify parameters to get more insight into a failure or run the tests against your local Webpack server.
+`./run.sh` will run the tests against the Element copy present in `element/element-web` served by a static Python HTTP server. You can symlink your `element-web` develop copy here but that doesn't work well with Webpack recompiling. You can run the test runner directly and specify parameters to get more insight into a failure or run the tests against your local Webpack server.
```
./synapse/stop.sh && \
@@ -26,8 +26,7 @@ It's important to always stop and start Synapse before each run of the tests to
start.js accepts these parameters (and more, see `node start.js --help`) that can help running the tests locally:
- - `--riot-url ` don't use the Riot copy and static server provided by the tests, but use a running server like the Webpack watch server to run the tests against. Make sure to have the following local config:
- - `welcomeUserId` disabled as the tests assume there is no riot-bot currently.
+ - `--app-url ` don't use the Element Web copy and static server provided by the tests, but use a running server like the Webpack watch server to run the tests against.
- `--slow-mo` type at a human speed, useful with `--windowed`.
- `--throttle-cpu ` throttle cpu in the browser by the given factor. Useful to reproduce failures because of insufficient timeouts happening on the slower CI server.
- `--windowed` run the tests in an actual browser window Try to limit interacting with the windows while the tests are running. Hovering over the window tends to fail the tests, dragging the title bar should be fine though.
diff --git a/test/end-to-end-tests/Windows.md b/test/end-to-end-tests/Windows.md
index 39b06a9a62..f6ea87d0af 100644
--- a/test/end-to-end-tests/Windows.md
+++ b/test/end-to-end-tests/Windows.md
@@ -5,14 +5,14 @@ and start following these steps to get going:
1. Navigate to your working directory (`cd /mnt/c/users/travisr/whatever/matrix-react-sdk` for example).
2. Run `sudo apt-get install unzip python3 virtualenv dos2unix`
-3. Run `dos2unix ./test/end-to-end-tests/*.sh ./test/end-to-end-tests/synapse/*.sh ./test/end-to-end-tests/riot/*.sh`
+3. Run `dos2unix ./test/end-to-end-tests/*.sh ./test/end-to-end-tests/synapse/*.sh ./test/end-to-end-tests/element/*.sh`
4. Install NodeJS for ubuntu:
```bash
curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
sudo apt-get update
sudo apt-get install nodejs
```
-5. Start Riot on Windows through `yarn start`
+5. Start Element on Windows through `yarn start`
6. While that builds... Run:
```bash
sudo apt-get install x11-apps
@@ -25,11 +25,11 @@ and start following these steps to get going:
cd ./test/end-to-end-tests
./synapse/install.sh
./install.sh
- ./run.sh --riot-url http://localhost:8080 --no-sandbox
+ ./run.sh --app-url http://localhost:8080 --no-sandbox
```
Note that using `yarn test:e2e` probably won't work for you. You might also have to use the config.json from the
-`riot/config-template` directory in order to actually succeed at the tests.
+`element/config-template` directory in order to actually succeed at the tests.
Also note that you'll have to use `--no-sandbox` otherwise Chrome will complain that there's no sandbox available. You
could probably fix this with enough effort, or you could run a headless Chrome in the WSL container without a sandbox.
diff --git a/test/end-to-end-tests/element/.gitignore b/test/end-to-end-tests/element/.gitignore
new file mode 100644
index 0000000000..57fac2072f
--- /dev/null
+++ b/test/end-to-end-tests/element/.gitignore
@@ -0,0 +1,2 @@
+element-web
+element.pid
diff --git a/test/end-to-end-tests/riot/config-template/config.json b/test/end-to-end-tests/element/config-template/config.json
similarity index 92%
rename from test/end-to-end-tests/riot/config-template/config.json
rename to test/end-to-end-tests/element/config-template/config.json
index b647d0bec8..b90fefc2cb 100644
--- a/test/end-to-end-tests/riot/config-template/config.json
+++ b/test/end-to-end-tests/element/config-template/config.json
@@ -8,7 +8,7 @@
"brand": "Element",
"integrations_ui_url": "https://scalar.vector.im/",
"integrations_rest_url": "https://scalar.vector.im/api",
- "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
+ "bug_report_endpoint_url": "https://element.io/bugreports/submit",
"showLabsSettings": true,
"default_federate": true,
"welcomePageUrl": "home.html",
diff --git a/test/end-to-end-tests/riot/install-webserver.sh b/test/end-to-end-tests/element/install-webserver.sh
similarity index 100%
rename from test/end-to-end-tests/riot/install-webserver.sh
rename to test/end-to-end-tests/element/install-webserver.sh
diff --git a/test/end-to-end-tests/element/install.sh b/test/end-to-end-tests/element/install.sh
new file mode 100755
index 0000000000..e38f795df1
--- /dev/null
+++ b/test/end-to-end-tests/element/install.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+set -e
+ELEMENT_BRANCH=develop
+
+if [ -d $BASE_DIR/element-web ]; then
+ echo "Element is already installed"
+ exit
+fi
+
+curl -L https://github.com/vector-im/element-web/archive/${ELEMENT_BRANCH}.zip --output element.zip
+unzip -q element.zip
+rm element.zip
+mv element-web-${ELEMENT_BRANCH} element-web
+cd element-web
+yarn install
+yarn run build
diff --git a/test/end-to-end-tests/riot/start.sh b/test/end-to-end-tests/element/start.sh
similarity index 87%
rename from test/end-to-end-tests/riot/start.sh
rename to test/end-to-end-tests/element/start.sh
index be226ed257..b344f91a19 100755
--- a/test/end-to-end-tests/riot/start.sh
+++ b/test/end-to-end-tests/element/start.sh
@@ -3,7 +3,7 @@ set -e
PORT=5000
BASE_DIR=$(cd $(dirname $0) && pwd)
-PIDFILE=$BASE_DIR/riot.pid
+PIDFILE=$BASE_DIR/element.pid
CONFIG_BACKUP=config.e2etests_backup.json
if [ -f $PIDFILE ]; then
@@ -11,8 +11,8 @@ if [ -f $PIDFILE ]; then
fi
cd $BASE_DIR/
-echo -n "starting riot on http://localhost:$PORT ... "
-pushd riot-web/webapp/ > /dev/null
+echo -n "Starting Element on http://localhost:$PORT ... "
+pushd element-web/webapp/ > /dev/null
# backup config file before we copy template
if [ -f config.json ]; then
@@ -34,7 +34,7 @@ LOGFILE=$(mktemp)
# NOT expected SIGTERM (128 + 15)
# from stop.sh?
if [ $RESULT -ne 143 ]; then
- echo "failed"
+ echo "Failed"
cat $LOGFILE
rm $PIDFILE 2> /dev/null
fi
@@ -49,6 +49,6 @@ sleep 0.5 &
wait -n; RESULT=$?
# return exit code of first child to exit
if [ $RESULT -eq 0 ]; then
- echo "running"
+ echo "Running"
fi
exit $RESULT
diff --git a/test/end-to-end-tests/riot/stop.sh b/test/end-to-end-tests/element/stop.sh
similarity index 79%
rename from test/end-to-end-tests/riot/stop.sh
rename to test/end-to-end-tests/element/stop.sh
index eb99fa11cc..e39f0077eb 100755
--- a/test/end-to-end-tests/riot/stop.sh
+++ b/test/end-to-end-tests/element/stop.sh
@@ -2,19 +2,19 @@
set -e
BASE_DIR=$(cd $(dirname $0) && pwd)
-PIDFILE=riot.pid
+PIDFILE=element.pid
CONFIG_BACKUP=config.e2etests_backup.json
cd $BASE_DIR
if [ -f $PIDFILE ]; then
- echo "stopping riot server ..."
+ echo "Stopping Element server ..."
PID=$(cat $PIDFILE)
rm $PIDFILE
kill $PID
# revert config file
- cd riot-web/webapp
+ cd element-web/webapp
rm config.json
if [ -f $CONFIG_BACKUP ]; then
mv $CONFIG_BACKUP config.json
diff --git a/test/end-to-end-tests/has_custom_riot.js b/test/end-to-end-tests/has-custom-app.js
similarity index 83%
rename from test/end-to-end-tests/has_custom_riot.js
rename to test/end-to-end-tests/has-custom-app.js
index 95f32d8ad0..00184088fd 100644
--- a/test/end-to-end-tests/has_custom_riot.js
+++ b/test/end-to-end-tests/has-custom-app.js
@@ -15,10 +15,10 @@ limitations under the License.
*/
// used from run.sh as getopts doesn't support long parameters
-const idx = process.argv.indexOf("--riot-url");
-let hasRiotUrl = false;
+const idx = process.argv.indexOf("--app-url");
+let hasAppUrl = false;
if (idx !== -1) {
const value = process.argv[idx + 1];
- hasRiotUrl = !!value;
+ hasAppUrl = !!value;
}
-process.stdout.write(hasRiotUrl ? "1" : "0" );
+process.stdout.write(hasAppUrl ? "1" : "0" );
diff --git a/test/end-to-end-tests/riot/.gitignore b/test/end-to-end-tests/riot/.gitignore
deleted file mode 100644
index 0f07d8e498..0000000000
--- a/test/end-to-end-tests/riot/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-riot-web
-riot.pid
\ No newline at end of file
diff --git a/test/end-to-end-tests/riot/install.sh b/test/end-to-end-tests/riot/install.sh
deleted file mode 100755
index f66ab3224e..0000000000
--- a/test/end-to-end-tests/riot/install.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-set -e
-RIOT_BRANCH=develop
-
-if [ -d $BASE_DIR/riot-web ]; then
- echo "riot is already installed"
- exit
-fi
-
-curl -L https://github.com/vector-im/riot-web/archive/${RIOT_BRANCH}.zip --output riot.zip
-unzip -q riot.zip
-rm riot.zip
-mv riot-web-${RIOT_BRANCH} riot-web
-cd riot-web
-yarn install
-yarn run build
diff --git a/test/end-to-end-tests/run.sh b/test/end-to-end-tests/run.sh
index b9d589eed9..4421bddc34 100755
--- a/test/end-to-end-tests/run.sh
+++ b/test/end-to-end-tests/run.sh
@@ -9,16 +9,16 @@ echo "Please first run $BASE_DIR/install.sh"
exit 1
fi
-has_custom_riot=$(node has_custom_riot.js $@)
+has_custom_app=$(node has-custom-app.js $@)
-if [ ! -d "riot/riot-web" ] && [ $has_custom_riot -ne "1" ]; then
- echo "Please provide an instance of riot to test against by passing --riot-url or running $BASE_DIR/riot/install.sh"
+if [ ! -d "element/element-web" ] && [ $has_custom_app -ne "1" ]; then
+ echo "Please provide an instance of Element to test against by passing --element-url or running $BASE_DIR/element/install.sh"
exit 1
fi
stop_servers() {
- if [ $has_custom_riot -ne "1" ]; then
- ./riot/stop.sh
+ if [ $has_custom_app -ne "1" ]; then
+ ./element/stop.sh
fi
./synapse/stop.sh
}
@@ -32,8 +32,8 @@ handle_error() {
trap 'handle_error' ERR
./synapse/start.sh
-if [ $has_custom_riot -ne "1" ]; then
- ./riot/start.sh
+if [ $has_custom_app -ne "1" ]; then
+ ./element/start.sh
fi
node start.js $@
stop_servers
diff --git a/test/end-to-end-tests/src/session.js b/test/end-to-end-tests/src/session.js
index 907ee2fb8e..433baa5e48 100644
--- a/test/end-to-end-tests/src/session.js
+++ b/test/end-to-end-tests/src/session.js
@@ -22,12 +22,12 @@ const {delay} = require('./util');
const DEFAULT_TIMEOUT = 20000;
-module.exports = class RiotSession {
- constructor(browser, page, username, riotserver, hsUrl) {
+module.exports = class ElementSession {
+ constructor(browser, page, username, elementServer, hsUrl) {
this.browser = browser;
this.page = page;
this.hsUrl = hsUrl;
- this.riotserver = riotserver;
+ this.elementServer = elementServer;
this.username = username;
this.consoleLog = new LogBuffer(page, "console", (msg) => `${msg.text()}\n`);
this.networkLog = new LogBuffer(page, "requestfinished", async (req) => {
@@ -38,7 +38,7 @@ module.exports = class RiotSession {
this.log = new Logger(this.username);
}
- static async create(username, puppeteerOptions, riotserver, hsUrl, throttleCpuFactor = 1) {
+ static async create(username, puppeteerOptions, elementServer, hsUrl, throttleCpuFactor = 1) {
const browser = await puppeteer.launch(puppeteerOptions);
const page = await browser.newPage();
await page.setViewport({
@@ -50,7 +50,7 @@ module.exports = class RiotSession {
console.log("throttling cpu by a factor of", throttleCpuFactor);
await client.send('Emulation.setCPUThrottlingRate', { rate: throttleCpuFactor });
}
- return new RiotSession(browser, page, username, riotserver, hsUrl);
+ return new ElementSession(browser, page, username, elementServer, hsUrl);
}
async tryGetInnertext(selector) {
@@ -194,7 +194,7 @@ module.exports = class RiotSession {
}
url(path) {
- return this.riotserver + path;
+ return this.elementServer + path;
}
delay(ms) {
diff --git a/test/end-to-end-tests/src/usecases/signup.js b/test/end-to-end-tests/src/usecases/signup.js
index ef8a259091..804cee9599 100644
--- a/test/end-to-end-tests/src/usecases/signup.js
+++ b/test/end-to-end-tests/src/usecases/signup.js
@@ -22,24 +22,12 @@ module.exports = async function signup(session, username, password, homeserver)
await session.goto(session.url('/#/register'));
// change the homeserver by clicking the advanced section
if (homeserver) {
- const advancedButton = await session.query('.mx_ServerTypeSelector_type_Advanced');
- await advancedButton.click();
+ const changeButton = await session.query('.mx_ServerPicker_change');
+ await changeButton.click();
- // depending on what HS is configured as the default, the advanced registration
- // goes the HS/IS entry directly (for matrix.org) or takes you to the user/pass entry (not matrix.org).
- // To work with both, we look for the "Change" link in the user/pass entry but don't fail when we can't find it
- // As this link should be visible immediately, and to not slow down the case where it isn't present,
- // pick a lower timeout of 5000ms
- try {
- const changeHsField = await session.query('.mx_AuthBody_editServerDetails', 5000);
- if (changeHsField) {
- await changeHsField.click();
- }
- } catch (err) {}
-
- const hsInputField = await session.query('#mx_ServerConfig_hsUrl');
+ const hsInputField = await session.query('.mx_ServerPickerDialog_otherHomeserver');
await session.replaceInputText(hsInputField, homeserver);
- const nextButton = await session.query('.mx_Login_submit');
+ const nextButton = await session.query('.mx_ServerPickerDialog_continue');
// accept homeserver
await nextButton.click();
}
@@ -68,7 +56,7 @@ module.exports = async function signup(session, username, password, homeserver)
await registerButton.click();
//confirm dialog saying you cant log back in without e-mail
- const continueButton = await session.query('.mx_QuestionDialog button.mx_Dialog_primary');
+ const continueButton = await session.query('.mx_RegistrationEmailPromptDialog button.mx_Dialog_primary');
await continueButton.click();
//find the privacy policy checkbox and check it
diff --git a/test/end-to-end-tests/start.js b/test/end-to-end-tests/start.js
index 6c80608903..234d60da9f 100644
--- a/test/end-to-end-tests/start.js
+++ b/test/end-to-end-tests/start.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-const RiotSession = require('./src/session');
+const ElementSession = require('./src/session');
const scenario = require('./src/scenario');
const RestSessionCreator = require('./src/rest/creator');
const fs = require("fs");
@@ -22,7 +22,7 @@ const fs = require("fs");
const program = require('commander');
program
.option('--no-logs', "don't output logs, document html on error", false)
- .option('--riot-url [url]', "riot url to test", "http://localhost:5000")
+ .option('--app-url [url]', "url to test", "http://localhost:5000")
.option('--windowed', "dont run tests headless", false)
.option('--slow-mo', "type at a human speed", false)
.option('--dev-tools', "open chrome devtools in browser window", false)
@@ -57,7 +57,7 @@ async function runTests() {
);
async function createSession(username) {
- const session = await RiotSession.create(username, options, program.riotUrl, hsUrl, program.throttleCpu);
+ const session = await ElementSession.create(username, options, program.appUrl, hsUrl, program.throttleCpu);
sessions.push(session);
return session;
}
diff --git a/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml b/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml
index 536c017b9e..deb750666f 100644
--- a/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml
+++ b/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml
@@ -875,8 +875,8 @@ password_config:
# Enable sending emails for notification events
-# Defining a custom URL for Riot is only needed if email notifications
-# should contain links to a self-hosted installation of Riot; when set
+# Defining a custom URL for Element is only needed if email notifications
+# should contain links to a self-hosted installation of Element; when set
# the "app_name" setting is ignored.
#
# If your SMTP server requires authentication, the optional smtp_user &
@@ -897,7 +897,7 @@ email:
notif_template_html: notif_mail.html
notif_template_text: notif_mail.txt
notif_for_new_users: True
- riot_base_url: "http://localhost/riot"
+ client_base_url: "http://localhost/element"
#password_providers:
diff --git a/yarn.lock b/yarn.lock
index c06494d319..fa3e39732b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1256,10 +1256,10 @@
dependencies:
regenerator-runtime "^0.13.4"
-"@babel/runtime@^7.11.2":
- version "7.11.2"
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736"
- integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==
+"@babel/runtime@^7.12.5":
+ version "7.12.5"
+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
+ integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
dependencies:
regenerator-runtime "^0.13.4"
@@ -4842,9 +4842,9 @@ has@^1.0.1, has@^1.0.3:
function-bind "^1.1.1"
highlight.js@^10.1.2:
- version "10.1.2"
- resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.1.2.tgz#c20db951ba1c22c055010648dfffd7b2a968e00c"
- integrity sha512-Q39v/Mn5mfBlMff9r+zzA+gWxRsCRKwEMvYTiisLr/XUiFI/4puWt0Ojdko3R3JCNWGdOWaA5g/Yxqa23kC5AA==
+ version "10.4.1"
+ resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.4.1.tgz#d48fbcf4a9971c4361b3f95f302747afe19dbad0"
+ integrity sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg==
hoist-non-react-statics@^3.3.0:
version "3.3.2"
@@ -6390,10 +6390,10 @@ log-symbols@^2.0.0, log-symbols@^2.2.0:
dependencies:
chalk "^2.0.1"
-loglevel@^1.7.0:
- version "1.7.0"
- resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0"
- integrity sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==
+loglevel@^1.7.1:
+ version "1.7.1"
+ resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
+ integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==
lolex@^5.0.0, lolex@^5.1.2:
version "5.1.2"
@@ -6513,15 +6513,15 @@ mathml-tag-names@^2.0.1:
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
- version "9.2.0"
- resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6661bde6088e6e43f31198e8532432e162aef33c"
+ version "9.3.0"
+ resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/ff6612f9d0aa1a7c08b65a0b41c5ab997506016f"
dependencies:
- "@babel/runtime" "^7.11.2"
+ "@babel/runtime" "^7.12.5"
another-json "^0.2.0"
browser-request "^0.3.3"
bs58 "^4.0.1"
content-type "^1.0.4"
- loglevel "^1.7.0"
+ loglevel "^1.7.1"
qs "^6.9.4"
request "^2.88.2"
unhomoglyph "^1.0.6"
{ _t('Create your account') }
+{ _t('Create account') }
{ errorText } { serverDeadSection } - { this.renderServerComponent() } - { this.state.phase !== Phase.ServerDetails &&- {yourMatrixAccountText} - {editLink} -
} +{introText}
-
-
- );
- }
-}
diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
index 6628ca7120..60e57afc98 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -18,7 +18,6 @@ limitations under the License.
import React, {createRef} from 'react';
import PropTypes from 'prop-types';
-import url from 'url';
import classnames from 'classnames';
import * as sdk from '../../../index';
@@ -500,17 +499,11 @@ export class MsisdnAuthEntry extends React.Component {
});
try {
- const requiresIdServerParam =
- await this.props.matrixClient.doesServerRequireIdServerParam();
let result;
if (this._submitUrl) {
result = await this.props.matrixClient.submitMsisdnTokenOtherUrl(
this._submitUrl, this._sid, this.props.clientSecret, this.state.token,
);
- } else if (requiresIdServerParam) {
- result = await this.props.matrixClient.submitMsisdnToken(
- this._sid, this.props.clientSecret, this.state.token,
- );
} else {
throw new Error("The registration with MSISDN flow is misconfigured");
}
@@ -519,12 +512,6 @@ export class MsisdnAuthEntry extends React.Component {
sid: this._sid,
client_secret: this.props.clientSecret,
};
- if (requiresIdServerParam) {
- const idServerParsedUrl = url.parse(
- this.props.matrixClient.getIdentityServerUrl(),
- );
- creds.id_server = idServerParsedUrl.host;
- }
this.props.submitAuthDict({
type: MsisdnAuthEntry.LOGIN_TYPE,
// TODO: Remove `threepid_creds` once servers support proper UIA
diff --git a/src/components/views/auth/ModularServerConfig.js b/src/components/views/auth/ModularServerConfig.js
deleted file mode 100644
index 28fd16379d..0000000000
--- a/src/components/views/auth/ModularServerConfig.js
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-Copyright 2019 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import * as sdk from '../../../index';
-import { _t } from '../../../languageHandler';
-import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
-import SdkConfig from "../../../SdkConfig";
-import AutoDiscoveryUtils from "../../../utils/AutoDiscoveryUtils";
-import * as ServerType from '../../views/auth/ServerTypeSelector';
-import ServerConfig from "./ServerConfig";
-
-const MODULAR_URL = 'https://element.io/matrix-services' +
- '?utm_source=element-web&utm_medium=web&utm_campaign=element-web-authentication';
-
-// TODO: TravisR - Can this extend ServerConfig for most things?
-
-/*
- * Configure the Modular server name.
- *
- * This is a variant of ServerConfig with only the HS field and different body
- * text that is specific to the Modular case.
- */
-export default class ModularServerConfig extends ServerConfig {
- static propTypes = ServerConfig.propTypes;
-
- async validateAndApplyServer(hsUrl, isUrl) {
- // Always try and use the defaults first
- const defaultConfig: ValidatedServerConfig = SdkConfig.get()["validated_server_config"];
- if (defaultConfig.hsUrl === hsUrl && defaultConfig.isUrl === isUrl) {
- this.setState({busy: false, errorText: ""});
- this.props.onServerConfigChange(defaultConfig);
- return defaultConfig;
- }
-
- this.setState({
- hsUrl,
- isUrl,
- busy: true,
- errorText: "",
- });
-
- try {
- const result = await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl, isUrl);
- this.setState({busy: false, errorText: ""});
- this.props.onServerConfigChange(result);
- return result;
- } catch (e) {
- console.error(e);
- let message = _t("Unable to validate homeserver/identity server");
- if (e.translatedMessage) {
- message = e.translatedMessage;
- }
- this.setState({
- busy: false,
- errorText: message,
- });
-
- return null;
- }
- }
-
- async validateServer() {
- // TODO: Do we want to support .well-known lookups here?
- // If for some reason someone enters "matrix.org" for a URL, we could do a lookup to
- // find their homeserver without demanding they use "https://matrix.org"
- return this.validateAndApplyServer(this.state.hsUrl, ServerType.TYPES.PREMIUM.identityServerUrl);
- }
-
- render() {
- const Field = sdk.getComponent('elements.Field');
- const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-
- const submitButton = this.props.submitText
- ?
- { _t("Custom Server Options") }
-
-
-
- {_t( - "You can use the custom server options to sign into other " + - "Matrix servers by specifying a different homeserver URL. This " + - "allows you to use %(brand)s with an existing Matrix account on a " + - "different homeserver.", - { brand }, - )}
-
-
-
-
-
- );
- }
-}
diff --git a/src/components/views/auth/PasswordLogin.tsx b/src/components/views/auth/PasswordLogin.tsx
index fced2e08d0..84e583c3a5 100644
--- a/src/components/views/auth/PasswordLogin.tsx
+++ b/src/components/views/auth/PasswordLogin.tsx
@@ -1,5 +1,5 @@
/*
-Copyright 2015, 2016, 2017, 2019 New Vector Ltd.
+Copyright 2015, 2016, 2017, 2019 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@ import withValidation from "../elements/Validation";
import * as Email from "../../../email";
import Field from "../elements/Field";
import CountryDropdown from "./CountryDropdown";
-import SignInToText from "./SignInToText";
// For validating phone numbers without country codes
const PHONE_NUMBER_REGEX = /^[0-9()\-\s]*$/;
@@ -47,7 +46,6 @@ interface IProps {
onUsernameBlur?(username: string): void;
onPhoneCountryChanged?(phoneCountry: string): void;
onPhoneNumberChanged?(phoneNumber: string): void;
- onEditServerDetailsClick?(): void;
onForgotPasswordClick?(): void;
}
@@ -70,7 +68,6 @@ enum LoginField {
*/
export default class PasswordLogin extends React.PureComponent{_t("Your server")}
- {_t( - "Enter the location of your Element Matrix Services homeserver. It may use your own " + - "domain name or be a subdomain of element.io.", - {}, { - a: sub => - {sub} - , - }, - )} - -
-
;
} else {
emailHelperText =
- {_t(
- "Set an email for account recovery. " +
- "Use email to optionally be discoverable by existing contacts.",
- )}
+ {
+ _t("Add an email to be able to reset your password.")
+ } {
+ _t("Use email to optionally be discoverable by existing contacts.")
+ }
;
}
}
- const haveIs = Boolean(this.props.serverConfig.isUrl);
- let noIsText = null;
- if (this.props.serverRequiresIdServer && !haveIs) {
- noIsText =
- {_t(
- "No identity server is configured so you cannot add an email address in order to " +
- "reset your password in the future.",
- )}
-
;
- }
return (
@@ -579,7 +547,6 @@ export default class RegistrationForm extends React.PureComponent
{ emailHelperText }
- { noIsText }
{ registerButton }
diff --git a/src/components/views/auth/ServerConfig.js b/src/components/views/auth/ServerConfig.js
deleted file mode 100644
index e04bf9e25a..0000000000
--- a/src/components/views/auth/ServerConfig.js
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import Modal from '../../../Modal';
-import * as sdk from '../../../index';
-import { _t } from '../../../languageHandler';
-import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
-import AutoDiscoveryUtils from "../../../utils/AutoDiscoveryUtils";
-import SdkConfig from "../../../SdkConfig";
-import { createClient } from 'matrix-js-sdk/src/matrix';
-import classNames from 'classnames';
-import CountlyAnalytics from "../../../CountlyAnalytics";
-
-/*
- * A pure UI component which displays the HS and IS to use.
- */
-
-export default class ServerConfig extends React.PureComponent {
- static propTypes = {
- onServerConfigChange: PropTypes.func.isRequired,
-
- // The current configuration that the user is expecting to change.
- serverConfig: PropTypes.instanceOf(ValidatedServerConfig).isRequired,
-
- delayTimeMs: PropTypes.number, // time to wait before invoking onChanged
-
- // Called after the component calls onServerConfigChange
- onAfterSubmit: PropTypes.func,
-
- // Optional text for the submit button. If falsey, no button will be shown.
- submitText: PropTypes.string,
-
- // Optional class for the submit button. Only applies if the submit button
- // is to be rendered.
- submitClass: PropTypes.string,
-
- // Whether the flow this component is embedded in requires an identity
- // server when the homeserver says it will need one. Default false.
- showIdentityServerIfRequiredByHomeserver: PropTypes.bool,
- };
-
- static defaultProps = {
- onServerConfigChange: function() {},
- delayTimeMs: 0,
- };
-
- constructor(props) {
- super(props);
-
- this.state = {
- busy: false,
- errorText: "",
- hsUrl: props.serverConfig.hsUrl,
- isUrl: props.serverConfig.isUrl,
- showIdentityServer: false,
- };
-
- CountlyAnalytics.instance.track("onboarding_custom_server");
- }
-
- // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
- UNSAFE_componentWillReceiveProps(newProps) { // eslint-disable-line camelcase
- if (newProps.serverConfig.hsUrl === this.state.hsUrl &&
- newProps.serverConfig.isUrl === this.state.isUrl) return;
-
- this.validateAndApplyServer(newProps.serverConfig.hsUrl, newProps.serverConfig.isUrl);
- }
-
- async validateServer() {
- // TODO: Do we want to support .well-known lookups here?
- // If for some reason someone enters "matrix.org" for a URL, we could do a lookup to
- // find their homeserver without demanding they use "https://matrix.org"
- const result = this.validateAndApplyServer(this.state.hsUrl, this.state.isUrl);
- if (!result) {
- return result;
- }
-
- // If the UI flow this component is embedded in requires an identity
- // server when the homeserver says it will need one, check first and
- // reveal this field if not already shown.
- // XXX: This a backward compatibility path for homeservers that require
- // an identity server to be passed during certain flows.
- // See also https://github.com/matrix-org/synapse/pull/5868.
- if (
- this.props.showIdentityServerIfRequiredByHomeserver &&
- !this.state.showIdentityServer &&
- await this.isIdentityServerRequiredByHomeserver()
- ) {
- this.setState({
- showIdentityServer: true,
- });
- return null;
- }
-
- return result;
- }
-
- async validateAndApplyServer(hsUrl, isUrl) {
- // Always try and use the defaults first
- const defaultConfig: ValidatedServerConfig = SdkConfig.get()["validated_server_config"];
- if (defaultConfig.hsUrl === hsUrl && defaultConfig.isUrl === isUrl) {
- this.setState({
- hsUrl: defaultConfig.hsUrl,
- isUrl: defaultConfig.isUrl,
- busy: false,
- errorText: "",
- });
- this.props.onServerConfigChange(defaultConfig);
- return defaultConfig;
- }
-
- this.setState({
- hsUrl,
- isUrl,
- busy: true,
- errorText: "",
- });
-
- try {
- const result = await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl, isUrl);
- this.setState({busy: false, errorText: ""});
- this.props.onServerConfigChange(result);
- return result;
- } catch (e) {
- console.error(e);
-
- const stateForError = AutoDiscoveryUtils.authComponentStateForError(e);
- if (!stateForError.isFatalError) {
- this.setState({
- busy: false,
- });
- // carry on anyway
- const result = await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl, isUrl, true);
- this.props.onServerConfigChange(result);
- return result;
- } else {
- let message = _t("Unable to validate homeserver/identity server");
- if (e.translatedMessage) {
- message = e.translatedMessage;
- }
- this.setState({
- busy: false,
- errorText: message,
- });
-
- return null;
- }
- }
- }
-
- async isIdentityServerRequiredByHomeserver() {
- // XXX: We shouldn't have to create a whole new MatrixClient just to
- // check if the homeserver requires an identity server... Should it be
- // extracted to a static utils function...?
- return createClient({
- baseUrl: this.state.hsUrl,
- }).doesServerRequireIdServerParam();
- }
-
- onHomeserverBlur = (ev) => {
- this._hsTimeoutId = this._waitThenInvoke(this._hsTimeoutId, () => {
- this.validateServer();
- });
- };
-
- onHomeserverChange = (ev) => {
- const hsUrl = ev.target.value;
- this.setState({ hsUrl });
- };
-
- onIdentityServerBlur = (ev) => {
- this._isTimeoutId = this._waitThenInvoke(this._isTimeoutId, () => {
- this.validateServer();
- });
- };
-
- onIdentityServerChange = (ev) => {
- const isUrl = ev.target.value;
- this.setState({ isUrl });
- };
-
- onSubmit = async (ev) => {
- ev.preventDefault();
- ev.stopPropagation();
- const result = await this.validateServer();
- if (!result) return; // Do not continue.
-
- if (this.props.onAfterSubmit) {
- this.props.onAfterSubmit();
- }
- };
-
- _waitThenInvoke(existingTimeoutId, fn) {
- if (existingTimeoutId) {
- clearTimeout(existingTimeoutId);
- }
- return setTimeout(fn.bind(this), this.props.delayTimeMs);
- }
-
- showHelpPopup = () => {
- const CustomServerDialog = sdk.getComponent('auth.CustomServerDialog');
- Modal.createTrackedDialog('Custom Server Dialog', '', CustomServerDialog);
- };
-
- _renderHomeserverSection() {
- const Field = sdk.getComponent('elements.Field');
- return
- {_t("Enter your custom homeserver URL What does this mean?", {}, {
- a: sub =>
- {sub}
- ,
- })}
-
;
- }
-
- _renderIdentityServerSection() {
- const Field = sdk.getComponent('elements.Field');
- const classes = classNames({
- "mx_ServerConfig_identityServer": true,
- "mx_ServerConfig_identityServer_shown": this.state.showIdentityServer,
- });
- return
- {_t("Enter your custom identity server URL What does this mean?", {}, {
- a: sub =>
- {sub}
- ,
- })}
-
;
- }
-
- render() {
- const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-
- const errorText = this.state.errorText
- ? {this.state.errorText}
- : null;
-
- const submitButton = this.props.submitText
- ? ,
- description: () => _t('Join millions for free on the largest public server'),
- serverConfig: makeType(ValidatedServerConfig, {
- hsUrl: "https://matrix-client.matrix.org",
- hsName: "matrix.org",
- hsNameIsDifferent: false,
- isUrl: "https://vector.im",
- }),
- },
- PREMIUM: {
- id: PREMIUM,
- label: () => _t('Premium'),
- logo: () => ,
- description: () => _t('Premium hosting for organisations Learn more', {}, {
- a: sub =>
- {sub}
- ,
- }),
- identityServerUrl: "https://vector.im",
- },
- ADVANCED: {
- id: ADVANCED,
- label: () => _t('Advanced'),
- logo: () =>
- })
- {_t('Other')}
-
,
- description: () => _t('Find other public servers or use a custom server'),
- },
-};
-
-export function getTypeFromServerConfig(config) {
- const {hsUrl} = config;
- if (!hsUrl) {
- return null;
- } else if (hsUrl === TYPES.FREE.serverConfig.hsUrl) {
- return FREE;
- } else if (new URL(hsUrl).hostname.endsWith('.modular.im')) {
- // This is an unlikely case to reach, as Modular defaults to hiding the
- // server type selector.
- return PREMIUM;
- } else {
- return ADVANCED;
- }
-}
-
-export default class ServerTypeSelector extends React.PureComponent {
- static propTypes = {
- // The default selected type.
- selected: PropTypes.string,
- // Handler called when the selected type changes.
- onChange: PropTypes.func.isRequired,
- };
-
- constructor(props) {
- super(props);
-
- const {
- selected,
- } = props;
-
- this.state = {
- selected,
- };
- }
-
- updateSelectedType(type) {
- if (this.state.selected === type) {
- return;
- }
- this.setState({
- selected: type,
- });
- if (this.props.onChange) {
- this.props.onChange(type);
- }
- }
-
- onClick = (e) => {
- e.stopPropagation();
- const type = e.currentTarget.dataset.id;
- this.updateSelectedType(type);
- };
-
- render() {
- const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-
- const serverTypes = [];
- for (const type of Object.values(TYPES)) {
- const { id, label, logo, description } = type;
- const classes = classnames(
- "mx_ServerTypeSelector_type",
- `mx_ServerTypeSelector_type_${id}`,
- {
- "mx_ServerTypeSelector_type_selected": id === this.state.selected,
- },
- );
-
- serverTypes.push(
- {_t('Other')}
-
-
-
-
);
- }
-
- return
- {label()}
-
-
- {logo()}
-
-
- {description()}
-
-
- {serverTypes}
-
;
- }
-}
diff --git a/src/components/views/auth/SignInToText.js b/src/components/views/auth/SignInToText.js
deleted file mode 100644
index 7564096b7d..0000000000
--- a/src/components/views/auth/SignInToText.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import {_t} from "../../../languageHandler";
-import * as sdk from "../../../index";
-import PropTypes from "prop-types";
-import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
-
-export default class SignInToText extends React.PureComponent {
- static propTypes = {
- serverConfig: PropTypes.instanceOf(ValidatedServerConfig).isRequired,
- onEditServerDetailsClick: PropTypes.func,
- };
-
- render() {
- let signInToText = _t('Sign in to your Matrix account on %(serverName)s', {
- serverName: this.props.serverConfig.hsName,
- });
- if (this.props.serverConfig.hsNameIsDifferent) {
- const TextWithTooltip = sdk.getComponent("elements.TextWithTooltip");
-
- signInToText = _t('Sign in to your Matrix account on - {signInToText} - {editLink} -
; - } -} diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js index bc4514f8a6..6b871e4f24 100644 --- a/src/components/views/context_menus/MessageContextMenu.js +++ b/src/components/views/context_menus/MessageContextMenu.js @@ -149,7 +149,7 @@ export default class MessageContextMenu extends React.Component { onRedactClick = () => { const ConfirmRedactDialog = sdk.getComponent("dialogs.ConfirmRedactDialog"); Modal.createTrackedDialog('Confirm Redact Dialog', '', ConfirmRedactDialog, { - onFinished: async (proceed) => { + onFinished: async (proceed, reason) => { if (!proceed) return; const cli = MatrixClientPeg.get(); @@ -157,6 +157,8 @@ export default class MessageContextMenu extends React.Component { await cli.redactEvent( this.props.mxEvent.getRoomId(), this.props.mxEvent.getId(), + undefined, + reason ? { reason } : {}, ); } catch (e) { const code = e.errcode || e.statusCode; diff --git a/src/components/views/context_menus/WidgetContextMenu.tsx b/src/components/views/context_menus/WidgetContextMenu.tsx index 7656e70341..8026942038 100644 --- a/src/components/views/context_menus/WidgetContextMenu.tsx +++ b/src/components/views/context_menus/WidgetContextMenu.tsx @@ -57,7 +57,7 @@ const WidgetContextMenu: React.FC
{ this.props.description }
diff --git a/src/components/views/dialogs/RegistrationEmailPromptDialog.tsx b/src/components/views/dialogs/RegistrationEmailPromptDialog.tsx
new file mode 100644
index 0000000000..b7cc81c113
--- /dev/null
+++ b/src/components/views/dialogs/RegistrationEmailPromptDialog.tsx
@@ -0,0 +1,96 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import * as React from "react";
+
+import { _t } from '../../../languageHandler';
+import { IDialogProps } from "./IDialogProps";
+import {useRef, useState} from "react";
+import Field from "../elements/Field";
+import CountlyAnalytics from "../../../CountlyAnalytics";
+import withValidation from "../elements/Validation";
+import * as Email from "../../../email";
+import BaseDialog from "./BaseDialog";
+import DialogButtons from "../elements/DialogButtons";
+
+interface IProps extends IDialogProps {
+ onFinished(continued: boolean, email?: string): void;
+}
+
+const validation = withValidation({
+ rules: [
+ {
+ key: "email",
+ test: ({ value }) => !value || Email.looksValid(value),
+ invalid: () => _t("Doesn't look like a valid email address"),
+ },
+ ],
+});
+
+const RegistrationEmailPromptDialog: React.FC = ({onFinished}) => {
+ const [email, setEmail] = useState("");
+ const fieldRef = useRef();
+
+ const onSubmit = async () => {
+ if (email) {
+ const valid = await fieldRef.current.validate({ allowEmpty: false });
+
+ if (!valid) {
+ fieldRef.current.focus();
+ fieldRef.current.validate({ allowEmpty: false, focused: true });
+ return;
+ }
+ }
+
+ onFinished(true, email);
+ };
+
+ return onFinished(false)}
+ fixedWidth={false}
+ >
+ ;
+};
+
+export default RegistrationEmailPromptDialog;
diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js
index a43b284c42..9d9313f08f 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.js
+++ b/src/components/views/dialogs/RoomSettingsDialog.js
@@ -53,9 +53,9 @@ export default class RoomSettingsDialog extends React.Component {
}
_onAction = (payload) => {
- // When room changes below us, close the room settings
+ // When view changes below us, close the room settings
// whilst the modal is open this can only be triggered when someone hits Leave Room
- if (payload.action === 'view_next_room') {
+ if (payload.action === 'view_home_page') {
this.props.onFinished();
}
};
diff --git a/src/components/views/dialogs/ServerPickerDialog.tsx b/src/components/views/dialogs/ServerPickerDialog.tsx
new file mode 100644
index 0000000000..4d967220e0
--- /dev/null
+++ b/src/components/views/dialogs/ServerPickerDialog.tsx
@@ -0,0 +1,225 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, {createRef} from "react";
+import {AutoDiscovery} from "matrix-js-sdk/src/autodiscovery";
+
+import AutoDiscoveryUtils, {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
+import BaseDialog from './BaseDialog';
+import { _t } from '../../../languageHandler';
+import AccessibleButton from "../elements/AccessibleButton";
+import SdkConfig from "../../../SdkConfig";
+import Field from "../elements/Field";
+import StyledRadioButton from "../elements/StyledRadioButton";
+import TextWithTooltip from "../elements/TextWithTooltip";
+import withValidation, {IFieldState} from "../elements/Validation";
+
+interface IProps {
+ title?: string;
+ serverConfig: ValidatedServerConfig;
+ onFinished(config?: ValidatedServerConfig): void;
+}
+
+interface IState {
+ defaultChosen: boolean;
+ otherHomeserver: string;
+}
+
+export default class ServerPickerDialog extends React.PureComponent {
+ private readonly defaultServer: ValidatedServerConfig;
+ private readonly fieldRef = createRef();
+ private validatedConf: ValidatedServerConfig;
+
+ constructor(props) {
+ super(props);
+
+ const config = SdkConfig.get();
+ this.defaultServer = config["validated_server_config"] as ValidatedServerConfig;
+ const { serverConfig } = this.props;
+ this.state = {
+ defaultChosen: serverConfig.isDefault,
+ otherHomeserver: serverConfig.isDefault ? "" : (serverConfig.hsName || serverConfig.hsUrl),
+ };
+ }
+
+ private onDefaultChosen = () => {
+ this.setState({ defaultChosen: true });
+ };
+
+ private onOtherChosen = () => {
+ this.setState({ defaultChosen: false });
+ };
+
+ private onHomeserverChange = (ev) => {
+ this.setState({ otherHomeserver: ev.target.value });
+ };
+
+ // TODO: Do we want to support .well-known lookups here?
+ // If for some reason someone enters "matrix.org" for a URL, we could do a lookup to
+ // find their homeserver without demanding they use "https://matrix.org"
+ private validate = withValidation({
+ deriveData: async ({ value }) => {
+ let hsUrl = value.trim(); // trim to account for random whitespace
+
+ // if the URL has no protocol, try validate it as a serverName via well-known
+ if (!hsUrl.includes("://")) {
+ try {
+ const discoveryResult = await AutoDiscovery.findClientConfig(hsUrl);
+ this.validatedConf = AutoDiscoveryUtils.buildValidatedConfigFromDiscovery(hsUrl, discoveryResult);
+ return {}; // we have a validated config, we don't need to try the other paths
+ } catch (e) {
+ console.error(`Attempted ${hsUrl} as a server_name but it failed`, e);
+ }
+ }
+
+ // if we got to this stage then either the well-known failed or the URL had a protocol specified,
+ // so validate statically only. If the URL has no protocol, default to https.
+ if (!hsUrl.includes("://")) {
+ hsUrl = "https://" + hsUrl;
+ }
+
+ try {
+ this.validatedConf = await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl);
+ return {};
+ } catch (e) {
+ console.error(e);
+
+ const stateForError = AutoDiscoveryUtils.authComponentStateForError(e);
+ if (stateForError.isFatalError) {
+ let error = _t("Unable to validate homeserver");
+ if (e.translatedMessage) {
+ error = e.translatedMessage;
+ }
+ return { error };
+ }
+
+ // try to carry on anyway
+ try {
+ this.validatedConf = await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl, null, true);
+ return {};
+ } catch (e) {
+ console.error(e);
+ return { error: _t("Invalid URL") };
+ }
+ }
+ },
+ rules: [
+ {
+ key: "required",
+ test: ({ value, allowEmpty }) => allowEmpty || !!value,
+ invalid: () => _t("Specify a homeserver"),
+ }, {
+ key: "valid",
+ test: async function({ value }, { error }) {
+ if (!value) return true;
+ return !error;
+ },
+ invalid: function({ error }) {
+ return error;
+ },
+ },
+ ],
+ });
+
+ private onHomeserverValidate = (fieldState: IFieldState) => this.validate(fieldState);
+
+ private onSubmit = async (ev) => {
+ ev.preventDefault();
+
+ const valid = await this.fieldRef.current.validate({ allowEmpty: false });
+
+ if (!valid) {
+ this.fieldRef.current.focus();
+ this.fieldRef.current.validate({ allowEmpty: false, focused: true });
+ return;
+ }
+
+ this.props.onFinished(this.validatedConf);
+ };
+
+ public render() {
+ let text;
+ if (this.defaultServer.hsName === "matrix.org") {
+ text = _t("Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.");
+ }
+
+ let defaultServerName = this.defaultServer.hsName;
+ if (this.defaultServer.hsNameIsDifferent) {
+ defaultServerName = (
+
+ {this.defaultServer.hsName}
+
+ );
+ }
+
+ return
+
+ ;
+ }
+}
diff --git a/src/components/views/elements/Field.tsx b/src/components/views/elements/Field.tsx
index fb34f51b60..f5754da9ae 100644
--- a/src/components/views/elements/Field.tsx
+++ b/src/components/views/elements/Field.tsx
@@ -61,6 +61,10 @@ interface IProps {
tooltipClassName?: string;
// If specified, an additional class name to apply to the field container
className?: string;
+ // On what events should validation occur; by default on all
+ validateOnFocus?: boolean;
+ validateOnBlur?: boolean;
+ validateOnChange?: boolean;
// All other props pass through to the .
}
@@ -100,6 +104,9 @@ export default class Field extends React.PureComponent {
public static readonly defaultProps = {
element: "input",
type: "text",
+ validateOnFocus: true,
+ validateOnBlur: true,
+ validateOnChange: true,
};
/*
@@ -137,9 +144,11 @@ export default class Field extends React.PureComponent {
this.setState({
focused: true,
});
- this.validate({
- focused: true,
- });
+ if (this.props.validateOnFocus) {
+ this.validate({
+ focused: true,
+ });
+ }
// Parent component may have supplied its own `onFocus` as well
if (this.props.onFocus) {
this.props.onFocus(ev);
@@ -147,7 +156,9 @@ export default class Field extends React.PureComponent {
};
private onChange = (ev) => {
- this.validateOnChange();
+ if (this.props.validateOnChange) {
+ this.validateOnChange();
+ }
// Parent component may have supplied its own `onChange` as well
if (this.props.onChange) {
this.props.onChange(ev);
@@ -158,16 +169,18 @@ export default class Field extends React.PureComponent {
this.setState({
focused: false,
});
- this.validate({
- focused: false,
- });
+ if (this.props.validateOnBlur) {
+ this.validate({
+ focused: false,
+ });
+ }
// Parent component may have supplied its own `onBlur` as well
if (this.props.onBlur) {
this.props.onBlur(ev);
}
};
- private async validate({ focused, allowEmpty = true }: {focused: boolean, allowEmpty?: boolean}) {
+ public async validate({ focused, allowEmpty = true }: {focused?: boolean, allowEmpty?: boolean}) {
if (!this.props.onValidate) {
return;
}
@@ -196,12 +209,15 @@ export default class Field extends React.PureComponent {
feedbackVisible: false,
});
}
+
+ return valid;
}
public render() {
/* eslint @typescript-eslint/no-unused-vars: ["error", { "ignoreRestSiblings": true }] */
const { element, prefixComponent, postfixComponent, className, onValidate, children,
- tooltipContent, forceValidity, tooltipClassName, list, ...inputProps} = this.props;
+ tooltipContent, forceValidity, tooltipClassName, list, validateOnBlur, validateOnChange, validateOnFocus,
+ ...inputProps} = this.props;
// Set some defaults for the element
const ref = input => this.input = input;
diff --git a/src/components/views/elements/SSOButton.js b/src/components/views/elements/SSOButton.js
deleted file mode 100644
index 1126ae3cd7..0000000000
--- a/src/components/views/elements/SSOButton.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import PlatformPeg from "../../../PlatformPeg";
-import AccessibleButton from "./AccessibleButton";
-import {_t} from "../../../languageHandler";
-
-const SSOButton = ({matrixClient, loginType, fragmentAfterLogin, ...props}) => {
- const onClick = () => {
- PlatformPeg.get().startSingleSignOn(matrixClient, loginType, fragmentAfterLogin);
- };
-
- return (
-
- {_t("Sign in with single sign-on")}
-
- );
-};
-
-SSOButton.propTypes = {
- matrixClient: PropTypes.object.isRequired, // does not use context as may use a temporary client
- loginType: PropTypes.oneOf(["sso", "cas"]), // defaults to "sso" in base-apis
- fragmentAfterLogin: PropTypes.string,
-};
-
-export default SSOButton;
diff --git a/src/components/views/elements/SSOButtons.tsx b/src/components/views/elements/SSOButtons.tsx
new file mode 100644
index 0000000000..f819b48cf6
--- /dev/null
+++ b/src/components/views/elements/SSOButtons.tsx
@@ -0,0 +1,110 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from "react";
+import {MatrixClient} from "matrix-js-sdk/src/client";
+
+import PlatformPeg from "../../../PlatformPeg";
+import AccessibleButton from "./AccessibleButton";
+import {_t} from "../../../languageHandler";
+import {IIdentityProvider, ISSOFlow} from "../../../Login";
+import classNames from "classnames";
+
+interface ISSOButtonProps extends Omit {
+ idp: IIdentityProvider;
+ mini?: boolean;
+}
+
+const SSOButton: React.FC = ({
+ matrixClient,
+ loginType,
+ fragmentAfterLogin,
+ idp,
+ primary,
+ mini,
+ ...props
+}) => {
+ const kind = primary ? "primary" : "primary_outline";
+ const label = idp ? _t("Continue with %(provider)s", { provider: idp.name }) : _t("Sign in with single sign-on");
+
+ const onClick = () => {
+ PlatformPeg.get().startSingleSignOn(matrixClient, loginType, fragmentAfterLogin, idp?.id);
+ };
+
+ let icon;
+ if (idp && idp.icon && idp.icon.startsWith("https://")) {
+ icon = 
;
+ }
+
+ const classes = classNames("mx_SSOButton", {
+ mx_SSOButton_mini: mini,
+ });
+
+ if (mini) {
+ // TODO fallback icon
+ return (
+
+ { icon }
+
+ );
+ }
+
+ return (
+
+ { icon }
+ { label }
+
+ );
+};
+
+interface IProps {
+ matrixClient: MatrixClient;
+ flow: ISSOFlow;
+ loginType?: "sso" | "cas";
+ fragmentAfterLogin?: string;
+ primary?: boolean;
+}
+
+const SSOButtons: React.FC = ({matrixClient, flow, loginType, fragmentAfterLogin, primary}) => {
+ const providers = flow.identity_providers || flow["org.matrix.msc2858.identity_providers"] || [];
+ if (providers.length < 2) {
+ return
+ {_t("Edit")}
+ ;
+ }
+
+ let serverName = serverConfig.hsName;
+ if (serverConfig.hsNameIsDifferent) {
+ serverName =
+ {serverConfig.hsName}
+ ;
+ }
+
+ let desc;
+ if (serverConfig.hsName === "matrix.org") {
+ desc =
+ {_t("Join millions for free on the largest public server")}
+ ;
+ }
+
+ return {
const senderName = this.props.mxEvent.sender?.name || this.props.mxEvent.getSender();
let joinCopy = _t('Join the conference at the top of this room');
- if (!WidgetStore.instance.isPinned(this.props.mxEvent.getStateKey())) {
+ if (!WidgetStore.instance.isPinned(this.props.mxEvent.getRoomId(), this.props.mxEvent.getStateKey())) {
joinCopy = _t('Join the conference from the room information card on the right');
}
diff --git a/src/components/views/right_panel/RoomSummaryCard.tsx b/src/components/views/right_panel/RoomSummaryCard.tsx
index 621e85e1d4..4ce4b75f9b 100644
--- a/src/components/views/right_panel/RoomSummaryCard.tsx
+++ b/src/components/views/right_panel/RoomSummaryCard.tsx
@@ -83,9 +83,10 @@ export const useWidgets = (room: Room) => {
interface IAppRowProps {
app: IApp;
+ room: Room;
}
-const AppRow: React.FC = ({ app }) => {
+const AppRow: React.FC = ({ app, room }) => {
const name = WidgetUtils.getWidgetName(app);
const dataTitle = WidgetUtils.getWidgetDataTitle(app);
const subtitle = dataTitle && " - " + dataTitle;
@@ -100,10 +101,10 @@ const AppRow: React.FC = ({ app }) => {
});
};
- const isPinned = WidgetStore.instance.isPinned(app.id);
+ const isPinned = WidgetStore.instance.isPinned(room.roomId, app.id);
const togglePin = isPinned
- ? () => { WidgetStore.instance.unpinWidget(app.id); }
- : () => { WidgetStore.instance.pinWidget(app.id); };
+ ? () => { WidgetStore.instance.unpinWidget(room.roomId, app.id); }
+ : () => { WidgetStore.instance.pinWidget(room.roomId, app.id); };
const [menuDisplayed, handle, openMenu, closeMenu] = useContextMenu();
let contextMenu;
@@ -118,7 +119,7 @@ const AppRow: React.FC = ({ app }) => {
/>;
}
- const cannotPin = !isPinned && !WidgetStore.instance.canPin(app.id);
+ const cannotPin = !isPinned && !WidgetStore.instance.canPin(room.roomId, app.id);
let pinTitle: string;
if (cannotPin) {
@@ -183,7 +184,7 @@ const AppsSection: React.FC = ({ room }) => {
};
return
- { apps.map(app =>
{ apps.length > 0 ? _t("Edit widgets, bridges & bots") : _t("Add widgets, bridges & bots") }
diff --git a/src/components/views/right_panel/WidgetCard.tsx b/src/components/views/right_panel/WidgetCard.tsx
index c1753e90e3..593bd0dde7 100644
--- a/src/components/views/right_panel/WidgetCard.tsx
+++ b/src/components/views/right_panel/WidgetCard.tsx
@@ -42,7 +42,7 @@ const WidgetCard: React.FC = ({ room, widgetId, onClose }) => {
const apps = useWidgets(room);
const app = apps.find(a => a.id === widgetId);
- const isPinned = app && WidgetStore.instance.isPinned(app.id);
+ const isPinned = app && WidgetStore.instance.isPinned(room.roomId, app.id);
const [menuDisplayed, handle, openMenu, closeMenu] = useContextMenu();
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index c358ef610d..11277daa57 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -745,13 +745,22 @@ export default class EventTile extends React.Component {
}
if (this.props.mxEvent.sender && avatarSize) {
+ let member;
+ // set member to receiver (target) if it is a 3PID invite
+ // so that the correct avatar is shown as the text is
+ // `$target accepted the invitation for $email`
+ if (this.props.mxEvent.getContent().third_party_invite) {
+ member = this.props.mxEvent.target;
+ } else {
+ member = this.props.mxEvent.sender;
+ }
avatar = (
- this.setState({showAdvanced: !this.state.showAdvanced})}
>
- {this.state.showAdvanced ? "Hide advanced" : "Show advanced"}
+ {this.state.showAdvanced ? _t("Hide advanced") : _t("Show advanced")}
;
let advanced: React.ReactNode;
diff --git a/src/i18n/strings/ar.json b/src/i18n/strings/ar.json
index fec025da8d..5da09afd23 100644
--- a/src/i18n/strings/ar.json
+++ b/src/i18n/strings/ar.json
@@ -1422,5 +1422,71 @@
"This will end the conference for everyone. Continue?": "هذا سينهي المؤتمر للجميع. استمر؟",
"The call was answered on another device.": "تم الرد على المكالمة على جهاز آخر.",
"The call could not be established": "تعذر إجراء المكالمة",
- "Call Declined": "رُفض الاتصال"
+ "Call Declined": "رُفض الاتصال",
+ "See videos posted to your active room": "أظهر الفيديوهات المرسلة إلى هذه غرفتك النشطة",
+ "See videos posted to this room": "أظهر الفيديوهات المرسلة إلى هذه الغرفة",
+ "Send videos as you in your active room": "أرسل الفيديوهات بهويتك في غرفتك النشطة",
+ "Send videos as you in this room": "أرسل الفيديوهات بهويتك في هذه الغرفة",
+ "See messages posted to this room": "أرسل الرسائل المرسلة إلى هذه الغرفة",
+ "See images posted to your active room": "أظهر الصور المرسلة إلى غرفتك النشطة",
+ "See images posted to this room": "أظهر الصور المرسلة إلى هذه الغرفة",
+ "Send images as you in your active room": "أرسل الصور بهويتك في غرفتك النشطة",
+ "Send images as you in this room": "أرسل الصور بهويتك في هذه الغرفة",
+ "See emotes posted to your active room": "أظهر الرموز التعبيرية المرسلة لغرفتك النشطة",
+ "See emotes posted to this room": "أظهر الرموز التعبيرية المرسلة إلى هذه الغرفة",
+ "Send emotes as you in your active room": "أظهر الرموز التعبيرية بهويتك في غرفتك النشطة",
+ "Send emotes as you in this room": "أرسل الرموز التعبيرية بهويتك",
+ "See text messages posted to your active room": "أظهر الرسائل النصية المرسلة إلى غرفتك النشطة",
+ "See text messages posted to this room": "أظهر الرسائل النصية المرسلة إلى هذه الغرفة",
+ "Send text messages as you in your active room": "أرسل الرسائل النصية بهويتك في غرفتك النشطة",
+ "Send text messages as you in this room": "أرسل الرسائل النصية بهويتك في هذه الغرفة",
+ "See messages posted to your active room": "أظهر الرسائل المرسلة إلى غرفتك النشطة",
+ "Send messages as you in your active room": "أرسل رسائل بهويتك في غرفتك النشطة",
+ "Send messages as you in this room": "أرسل رسائل بهويتك في هذه الغرفة",
+ "The %(capability)s capability": "القدرة %(capability)s",
+ "See %(eventType)s events posted to your active room": "أظهر أحداث %(eventType)s المنشورة بغرفة النشطة",
+ "Send %(eventType)s events as you in your active room": "أرسل أحداث %(eventType)s بهويتك في غرفتك النشطة",
+ "See %(eventType)s events posted to this room": "أظهر أحداث %(eventType)s المنشورة في هذه الغرفة",
+ "Send %(eventType)s events as you in this room": "أرسل أحداث %(eventType)s بهويتك في هذه الغرفة",
+ "with state key %(stateKey)s": "مع مفتاح الحالة %(stateKey)s",
+ "with an empty state key": "بمفتاح حالة فارغ",
+ "See when anyone posts a sticker to your active room": "أظهر وضع أي أحد للملصقات لغرفتك النشطة",
+ "Send stickers to your active room as you": "أرسل ملصقات لغرفتك النشطة بهويتك",
+ "See when a sticker is posted in this room": "أظهر وضع الملصقات في هذه الغرفة",
+ "Send stickers to this room as you": "أرسل ملصقات لهذه الغرفة بهويتك",
+ "See when the avatar changes in your active room": "أظهر تغييرات صورة غرفتك النشطة",
+ "Change the avatar of your active room": "غير صورة غرفتك النشطة",
+ "See when the avatar changes in this room": "أظهر تغييرات الصورة في هذه الغرفة",
+ "Change the avatar of this room": "غير صورة هذه الغرفة",
+ "See when the name changes in your active room": "أظهر تغييرات الاسم في غرفتك النشطة",
+ "Change the name of your active room": "غير اسم غرفتك النشطة",
+ "See when the name changes in this room": "أظهر تغييرات الاسم في هذه الغرفة",
+ "Change the name of this room": "غير اسم هذه الغرفة",
+ "See when the topic changes in your active room": "أظهر تغيير موضوع غرفتك النشطة",
+ "Change the topic of your active room": "غير موضوع غرفتك النشطة",
+ "See when the topic changes in this room": "أظهر تغير موضوع هذه الغرفة",
+ "Change the topic of this room": "تغيير موضوع هذه الغرفة",
+ "Change which room you're viewing": "تغيير الغرفة التي تشاهدها",
+ "Send stickers into your active room": "أرسل ملصقات إلى غرفتك النشطة",
+ "Send stickers into this room": "أرسل ملصقات إلى هذه الغرفة",
+ "Remain on your screen while running": "ابقَ على شاشتك أثناء إجراء",
+ "Remain on your screen when viewing another room, when running": "ابقَ على شاشتك عند مشاهدة غرفة أخرى أثناء إجراء",
+ "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s حدَّث قاعدة حظر المستخدمين المطابقة %(glob)s بسبب %(reason)s",
+ "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s حدَّث قاعدة حظر الخوادم المطابقة %(glob)s بسبب %(reason)s",
+ "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s حدَّث قاعدة حظر الغرفة المطابقة %(glob)s بسبب %(reason)s",
+ "%(senderName)s declined the call.": "%(senderName)s رفض المكالمة.",
+ "(an error occurred)": "(حدث خطأ)",
+ "(their device couldn't start the camera / microphone)": "(تعذر على جهازهم بدء تشغيل الكاميرا / الميكروفون)",
+ "(connection failed)": "(فشل الاتصال)",
+ "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 جميع الخوادم ممنوعة من المشاركة! لم يعد من الممكن استخدام هذه الغرفة.",
+ "Takes the call in the current room off hold": "يوقف المكالمة في الغرفة الحالية",
+ "Places the call in the current room on hold": "يضع المكالمة في الغرفة الحالية قيد الانتظار",
+ "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "يلصق (͡ ° ͜ʖ ͡ °) أوَّل رسالة نصية عادية",
+ "No other application is using the webcam": "لا يوجد تطبيق آخر يستخدم كاميرا الويب",
+ "Permission is granted to use the webcam": "منح الإذن باستخدام كاميرا الويب",
+ "A microphone and webcam are plugged in and set up correctly": "الميكروفون وكاميرا ويب موصولان ومعدان بشكل صحيح",
+ "Call failed because no webcam or microphone could not be accessed. Check that:": "فشلت المكالمة نظرًا لتعذر الوصول إلى كاميرا الويب أو الميكروفون. تحقق مما يلي:",
+ "Unable to access webcam / microphone": "تعذر الوصول إلى كاميرا الويب / الميكروفون",
+ "Call failed because no microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "فشلت المكالمة لأنه لا يمكن الوصول إلى ميكروفون. تحقق من توصيل الميكروفون وإعداده بشكل صحيح.",
+ "Unable to access microphone": "تعذر الوصول إلى الميكروفون"
}
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index b2e65e3f32..5d5ca50fc9 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -301,7 +301,7 @@
"Drop file here to upload": "Datei hier loslassen zum hochladen",
"Idle": "Untätig",
"Ongoing conference call%(supportedText)s.": "Laufendes Konferenzgespräch%(supportedText)s.",
- "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Du wirst jetzt auf die Website eines Drittanbieters weitergeleitet, damit du dein Benutzerkonto für die Verwendung von %(integrationsUrl)s authentifizieren kannst. Möchtest du fortfahren?",
+ "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Du wirst jetzt auf die Website eines Drittanbieters weitergeleitet, damit du dein Benutzerkonto für die Verwendung von %(integrationsUrl)s authentifizieren kannst. Möchtest du fortfahren?",
"Start automatically after system login": "Nach System-Login automatisch starten",
"Jump to first unread message.": "Zur ersten ungelesenen Nachricht springen.",
"Options": "Optionen",
@@ -711,7 +711,7 @@
"Enter keywords separated by a comma:": "Schlüsselwörter kommagetrennt eingeben:",
"Forward Message": "Nachricht weiterleiten",
"You have successfully set a password and an email address!": "Du hast erfolgreich ein Passwort und eine E-Mail-Adresse gesetzt!",
- "Remove %(name)s from the directory?": "Soll der Raum %(name)s aus dem Verzeichnis entfernt werden?",
+ "Remove %(name)s from the directory?": "Soll der Raum %(name)s aus dem Verzeichnis entfernt werden?",
"%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s nutzt zahlreiche fortgeschrittene Browser-Funktionen, die teilweise in deinem aktuell verwendeten Browser noch nicht verfügbar sind oder sich noch im experimentellen Status befinden.",
"Developer Tools": "Entwicklerwerkzeuge",
"Preparing to send logs": "Senden von Logs wird vorbereitet",
@@ -1099,7 +1099,7 @@
"Anchor": "Anker",
"Headphones": "Kopfhörer",
"Folder": "Ordner",
- "Pin": "Stecknadel",
+ "Pin": "Anheften",
"Timeline": "Chatverlauf",
"Autocomplete delay (ms)": "Verzögerung zur Autovervollständigung (ms)",
"Roles & Permissions": "Rollen & Berechtigungen",
@@ -2056,7 +2056,7 @@
"Your new session is now verified. Other users will see it as trusted.": "Deine neue Sitzung ist nun verifiziert. Andere Benutzer sehen sie als vertrauenswürdig an.",
"well formed": "wohlgeformt",
"If you don't want to use
+
+ {_t("Just a heads up, if you don't add an email and forget your password, you could " + + "permanently lose access to your account.", {}, { + b: sub => {sub}, + })}
+ +
+
;
+ }
+
+ return
+ { providers.map(idp => (
+
;
+};
+
+export default SSOButtons;
diff --git a/src/components/views/elements/ServerPicker.tsx b/src/components/views/elements/ServerPicker.tsx
new file mode 100644
index 0000000000..7637ab7b8d
--- /dev/null
+++ b/src/components/views/elements/ServerPicker.tsx
@@ -0,0 +1,93 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+
+import AccessibleButton from "./AccessibleButton";
+import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
+import {_t} from "../../../languageHandler";
+import TextWithTooltip from "./TextWithTooltip";
+import SdkConfig from "../../../SdkConfig";
+import Modal from "../../../Modal";
+import ServerPickerDialog from "../dialogs/ServerPickerDialog";
+import InfoDialog from "../dialogs/InfoDialog";
+
+interface IProps {
+ title?: string;
+ dialogTitle?: string;
+ serverConfig: ValidatedServerConfig;
+ onServerConfigChange?(config: ValidatedServerConfig): void;
+}
+
+const showPickerDialog = (
+ title: string,
+ serverConfig: ValidatedServerConfig,
+ onFinished: (config: ValidatedServerConfig) => void,
+) => {
+ Modal.createTrackedDialog("Server Picker", "", ServerPickerDialog, { title, serverConfig, onFinished });
+};
+
+const onHelpClick = () => {
+ Modal.createTrackedDialog('Custom Server Dialog', '', InfoDialog, {
+ title: _t("Server Options"),
+ description: _t("You can use the custom server options to sign into other Matrix servers by specifying " +
+ "a different homeserver URL. This allows you to use Element with an existing Matrix account on " +
+ "a different homeserver."),
+ button: _t("Dismiss"),
+ hasCloseButton: false,
+ fixedWidth: false,
+ }, "mx_ServerPicker_helpDialog");
+};
+
+const ServerPicker = ({ title, dialogTitle, serverConfig, onServerConfigChange }: IProps) => {
+ let editBtn;
+ if (!SdkConfig.get()["disable_custom_urls"] && onServerConfigChange) {
+ const onClick = () => {
+ showPickerDialog(dialogTitle, serverConfig, (config?: ValidatedServerConfig) => {
+ if (config) {
+ onServerConfigChange(config);
+ }
+ });
+ };
+ editBtn =
+
+}
+
+export default ServerPicker;
diff --git a/src/components/views/messages/MJitsiWidgetEvent.tsx b/src/components/views/messages/MJitsiWidgetEvent.tsx
index 82aa32d3b7..b87efd472a 100644
--- a/src/components/views/messages/MJitsiWidgetEvent.tsx
+++ b/src/components/views/messages/MJitsiWidgetEvent.tsx
@@ -35,7 +35,7 @@ export default class MJitsiWidgetEvent extends React.PureComponent{title || _t("Homeserver")}
+
-
+
+
);
}
diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
index 9f9acd8e3c..209f245b11 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
@@ -394,7 +394,7 @@ export default class AppearanceUserSettingsTab extends React.ComponentHTML for your community's page
\n\n Use the long description to introduce new members to the community, or distribute\n some important links\n
\n\n You can even add images with Matrix URLs \n
HTML für die Seite Ihrer Community
\n\n Verwenden Sie die ausführliche Beschreibung, um die Community neuen Mitgliedern vorzustellen,\n oder teilen Sie einige wichtige Links links\n
\n\n Sie können sogar Bilder mit Matrix-URLs hinzufügen \n
HTML for your community's page
\n\n Use the long description to introduce new members to the community, or distribute\n some important links\n
\n\n You can even add images with Matrix URLs \n
Sinu kogukonna lehe HTML'i näidis - see on pealkiri
\n\n Tutvustamaks uutele liikmetele kogukonda, kasuta seda pikka kirjeldust\n või jaga olulist teavet viidetena\n
\n\n Pildite lisaminseks võid sa isegi kasutada img-märgendit Matrix'i url'idega \n
HTML for your community's page
\n\n Use the long description to introduce new members to the community, or distribute\n some important links\n
\n\n You can even add images with Matrix URLs \n
HTML para a páxina da túa comunidade
\n\n Usa a descrición longa para presentar a comunidade ás novas particpantes, ou publicar \nalgunha ligazón importante\n \n
\n\n Tamén podes engadir imaxes con URLs de Matrix \n
HTML for your community's page
\n\n Use the long description to introduce new members to the community, or distribute\n some important links\n
\n\n You can even add images with Matrix URLs \n
HTML per la pagina della tua comunità
\n\n Usa la descrizione estesa per introdurre i nuovi membri alla comunità, o distribuisci\n alcuni link importanti\n
\n\n Puoi anche aggiungere immagini con gli URL Matrix \n
HTML for your community's page
\n\n Use the long description to introduce new members to the community, or distribute\n some important links\n
\n\n You can even add images with Matrix URLs \n
HTML para a página da sua comunidade
\n\n Escreva uma descrição longa para apresentar novos membros à comunidade, ou liste\n alguns links importantes\n
\n\n Você pode até adicionar fotos com URLs na Matrix \n
HTML for your community's page
\n\n Use the long description to introduce new members to the community, or distribute\n some important links\n
\n\n You can even add images with Matrix URLs \n
HTML për faqen e bashkësisë tuaj
\n\n Përdoreni përshkrimin e gjatë që t’i prezantoni bashkësisë anëtarë të rinj, ose për t’u dhënë lidhje të rëndësishme\n
\n\n Mundeni madje të shtoni figura me URL-ra Matrix \n
HTML for your community's page
\n\n Use the long description to introduce new members to the community, or distribute\n some important links\n
\n\n You can even add images with Matrix URLs \n
您社群頁面的 HTML
\n\n 使用詳細說明向社群介紹新成員，或散佈\n 一些重要的連結\n
\n\n 您甚至可以使用 Matrix URL 新增圖片\n