Skip to content

Commit f5209c0

Browse files
JorikSchellekensJorikSchellekens
committed
Merge branch 'develop' of github.com:vector-im/riot-web into joriks/delabs-font-scaling
2 parents 817759f + c94f55e commit f5209c0

12 files changed

Lines changed: 85 additions & 37 deletions

File tree

‎config.sample.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030
"feature_pinning": "labs",
3131
"feature_custom_status": "labs",
3232
"feature_custom_tags": "labs",
33-
"feature_state_counters": "labs",
34-
"feature_irc_ui": "labs"
33+
"feature_state_counters": "labs"
3534
},
3635
"default_federate": true,
3736
"default_theme": "light",

‎docs/labs.md‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,19 @@ theme definition.
9595

9696
For some sample themes, check out [aaronraimist/riot-web-themes](https://github.com/aaronraimist/riot-web-themes).
9797

98-
## New room list (`feature_new_room_list`)
98+
## New room list
9999

100100
A complete rewrite of the room list is underway to increase performance, stability,
101-
and general usability. This is still rapidly changing, but feel free to give it a test.
101+
and general usability.
102102

103-
## IRC message layout (`feature_irc_ui`)
103+
In the event the new room list needs to be disabled, add this to your config.json:
104+
```json
105+
{
106+
"settingDefaults": {
107+
"feature_new_room_list": false
108+
}
109+
}
110+
```
104111

105-
Adds an option to change the message layout to an IRC style ` timestamp | avatar
106-
| name | message `
112+
**Note**: In a future release the new room list will not be optional.
107113

‎riot.im/develop/config.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@
2323
"feature_dm_verification": "labs",
2424
"feature_bridge_state": "labs",
2525
"feature_presence_in_room_list": "labs",
26-
"feature_custom_themes": "labs",
27-
"feature_new_room_list": "labs",
28-
"feature_irc_ui": "labs"
26+
"feature_custom_themes": "labs"
2927
},
3028
"piwik": {
3129
"url": "https://piwik.riot.im/",

‎src/components/views/auth/VectorAuthPage.js‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2019 New Vector Ltd
2+
Copyright 2019, 2020 New Vector Ltd
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -14,30 +14,38 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
'use strict';
18-
1917
import React from 'react';
2018
import * as sdk from 'matrix-react-sdk/src/index';
2119
import SdkConfig from 'matrix-react-sdk/src/SdkConfig';
2220

2321
export default class VectorAuthPage extends React.PureComponent {
2422
static replaces = 'AuthPage'
2523

26-
render() {
27-
const AuthFooter = sdk.getComponent('auth.AuthFooter');
24+
static welcomeBackgroundUrl;
25+
26+
// cache the url as a static to prevent it changing without refreshing
27+
static getWelcomeBackgroundUrl() {
28+
if (VectorAuthPage.welcomeBackgroundUrl) return VectorAuthPage.welcomeBackgroundUrl;
2829

2930
const brandingConfig = SdkConfig.get().branding;
30-
let backgroundUrl = "themes/riot/img/backgrounds/valley.jpg";
31+
VectorAuthPage.welcomeBackgroundUrl = "themes/riot/img/backgrounds/valley.jpg";
3132
if (brandingConfig && brandingConfig.welcomeBackgroundUrl) {
3233
if (Array.isArray(brandingConfig.welcomeBackgroundUrl)) {
33-
backgroundUrl = brandingConfig.welcomeBackgroundUrl[Math.floor(Math.random() * brandingConfig.welcomeBackgroundUrl.length)];
34+
const index = Math.floor(Math.random() * brandingConfig.welcomeBackgroundUrl.length);
35+
VectorAuthPage.welcomeBackgroundUrl = brandingConfig.welcomeBackgroundUrl[index];
3436
} else {
35-
backgroundUrl = brandingConfig.welcomeBackgroundUrl;
37+
VectorAuthPage.welcomeBackgroundUrl = brandingConfig.welcomeBackgroundUrl;
3638
}
3739
}
3840

41+
return VectorAuthPage.welcomeBackgroundUrl;
42+
}
43+
44+
render() {
45+
const AuthFooter = sdk.getComponent('auth.AuthFooter');
46+
3947
const pageStyle = {
40-
background: `center/cover fixed url(${backgroundUrl})`,
48+
background: `center/cover fixed url(${VectorAuthPage.getWelcomeBackgroundUrl()})`,
4149
};
4250

4351
const modalStyle = {
@@ -65,7 +73,7 @@ export default class VectorAuthPage extends React.PureComponent {
6573
return (
6674
<div className="mx_AuthPage" style={pageStyle}>
6775
<div className="mx_AuthPage_modal" style={modalStyle}>
68-
<div className="mx_AuthPage_modalBlur" style={blurStyle}></div>
76+
<div className="mx_AuthPage_modalBlur" style={blurStyle} />
6977
<div className="mx_AuthPage_modalContent" style={modalContentStyle}>
7078
{ this.props.children }
7179
</div>

‎src/i18n/strings/eo.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,7 @@
3636
"You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Vi povas daŭre uzadi vian nunan foliumilon, sed iuj (eĉ ĉiuj) funkcioj eble ne funkcios, kaj la aspekto de la aplikaĵo eble ne estos ĝusta.",
3737
"I understand the risks and wish to continue": "Mi komprenas la riskon kaj volas pluiĝi",
3838
"Go to Riot.im": "Iri al Riot.im",
39-
"Failed to start": "Malsukcesis starti"
39+
"Failed to start": "Malsukcesis starti",
40+
"Download Completed": "Elŝuto finiĝis",
41+
"Open": "Malfermi"
4042
}

‎src/i18n/strings/et.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,7 @@
3636
"You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Sa võid jätkata praeguse brauseri kasutamist, kuid mõned või kõik funktsionaalsused ei pruugi toimida ning rakenduse välimus võib vigane olla.",
3737
"I understand the risks and wish to continue": "Ma mõistan riske ja soovin jätkata",
3838
"Go to Riot.im": "Mine Riot.im lehele",
39-
"Failed to start": "Käivitamine ei õnnestunud"
39+
"Failed to start": "Käivitamine ei õnnestunud",
40+
"Download Completed": "Allalaadimine on lõpetatud",
41+
"Open": "Ava"
4042
}

‎src/i18n/strings/fi.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"Unable to load config file: please refresh the page to try again.": "Asetustiedostoa ei voi ladata. Yritä uudelleen lataamalla sivu uudelleen.",
2727
"Open user settings": "Avaa käyttäjäasetukset",
2828
"Previous/next recently visited room or community": "Edellinen/seuraava hiljattain vierailtu huone tai yhteisö",
29-
"Riot Desktop (%(platformName)s)": "Riot Desktop (%(platformName)s)",
29+
"Riot Desktop (%(platformName)s)": "Riotin työpöytäversio (%(platformName)s)",
3030
"Go to your browser to complete Sign In": "Tee kirjautuminen loppuun selaimessasi",
3131
"%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
3232
"Unsupported browser": "Selainta ei tueta",
@@ -35,5 +35,8 @@
3535
"Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Asenna <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> tai <safariLink>Safari</safariLink>, jotta kaikki toimii parhaiten.",
3636
"You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Voit käyttää edelleen nykyistä selaintasi, mutta jotkut tai kaikki ominaisuudet eivät ehkä toimi ja sovelluksen ulkoasu voi olla virheellinen.",
3737
"I understand the risks and wish to continue": "Ymmärrän riskit ja haluan jatkaa",
38-
"Failed to start": "Käynnistys ei onnistunut"
38+
"Failed to start": "Käynnistys ei onnistunut",
39+
"Download Completed": "Lataus valmis",
40+
"Open": "Avaa",
41+
"Go to Riot.im": "Mene osoitteeseen riot.im"
3942
}

‎src/i18n/strings/it.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,7 @@
3636
"You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Puoi comunque usare il browser attuale, ma alcune o tutte le caratteristiche potrebbero non funzionare e l'aspetto dell'applicazione potrebbe essere sbagliato.",
3737
"I understand the risks and wish to continue": "Capisco i rischi e desidero continuare",
3838
"Go to Riot.im": "Vai su Riot.im",
39-
"Failed to start": "Avvio fallito"
39+
"Failed to start": "Avvio fallito",
40+
"Download Completed": "Scaricamento completato",
41+
"Open": "Apri"
4042
}

‎src/i18n/strings/ja.json‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"Your Riot is misconfigured": "あなたのRiotは設定が間違っています",
1414
"Invalid configuration: no default server specified.": "不正な設定です：デフォルトのサーバーが設定されていません。",
1515
"Sign In": "サインイン",
16-
"Create Account": "アカウントを作成する",
16+
"Create Account": "アカウント作成",
1717
"Need help?": "助けが必要ですか？",
1818
"Explore rooms": "部屋を探索する",
1919
"Room Directory": "部屋のディレクトリー",
@@ -26,5 +26,16 @@
2626
"Riot uses advanced browser features which aren't supported by your current browser.": "Riot ではこのブラウザでサポートされていない高度な機能を利用しています。",
2727
"Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "最高のユーザー体験を得るためには、<chromeLink>Chrome</chromeLink>や<firefoxLink>Firefox</firefoxLink>、もしくは<safariLink>Safari</safariLink>をインストールしてください。",
2828
"You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "現在のブラウザを使い続けることもできますが、いくつか (もしくは全ての) 機能が動作しない可能性や、外観が崩れる可能性があります。",
29-
"I understand the risks and wish to continue": "リスクを理解したうえで続行する"
29+
"I understand the risks and wish to continue": "リスクを理解したうえで続行する",
30+
"Missing indexeddb worker script!": "IndexedDBのワーカースクリプトがありません！",
31+
"Unable to load config file: please refresh the page to try again.": "設定ファイルの読み込みに失敗しました: ページを再読み込みしてもう一度お試しください。",
32+
"Download Completed": "ダウンロード完了",
33+
"Open": "開く",
34+
"Open user settings": "ユーザー設定を開く",
35+
"Riot Desktop (%(platformName)s)": "Riotデスクトップ版(%(platformName)s)",
36+
"Go to your browser to complete Sign In": "サインインを完了させるためにブラウザへ移動してください",
37+
"%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s(%(browserName)s, %(osName)s)",
38+
"Unsupported browser": "サポートされていないブラウザ",
39+
"Go to Riot.im": "Riot.imへ移動",
40+
"Failed to start": "起動に失敗しました"
3041
}

‎src/i18n/strings/pt_BR.json‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,22 @@
2121
"Your Riot is misconfigured": "Riot possui um erro de configuração",
2222
"Unexpected error preparing the app. See console for details.": "Erro inesperado preparando o aplicativo. Veja o console para mais detalhes.",
2323
"Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuração inválida: somente se pode especificar um valor entre default_server_config, default_server_name, ou default_hs_url.",
24-
"Invalid configuration: no default server specified.": "Configuração inválida: servidor padrão não especificado."
24+
"Invalid configuration: no default server specified.": "Configuração inválida: servidor padrão não especificado.",
25+
"Unable to load config file: please refresh the page to try again.": "Não foi possível carregar o arquivo de configuração: por favor atualize a página e tente novamente.",
26+
"Download Completed": "Download Concluído",
27+
"Open user settings": "Abrir configurações do usuário",
28+
"%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
29+
"Unsupported browser": "Navegador não suportado",
30+
"Your browser can't run Riot": "Riot não funciona em seu navegador",
31+
"Riot uses advanced browser features which aren't supported by your current browser.": "Riot usa recursos avançados do navegador que não são suportados pelo seu navegador atual.",
32+
"Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Instale o <chromeLink> Chrome </chromeLink>, o <firefoxLink> Firefox </firefoxLink> ou o <safariLink> Safari </safariLink> para obter uma melhor experiência.",
33+
"You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Você pode continuar usando o navegador atual, mas alguns dos recursos podem não funcionar e a aparência do aplicativo pode estar incorreta.",
34+
"I understand the risks and wish to continue": "Entendo os riscos e desejo continuar",
35+
"Go to Riot.im": "Vá para Riot.im",
36+
"Failed to start": "Falha ao iniciar",
37+
"Missing indexeddb worker script!": "Script de trabalho indexeddb não encontrado!",
38+
"Open": "Abrir",
39+
"Previous/next recently visited room or community": "Próxima/Anterior sala ou comunidade visitada recentemente",
40+
"Riot Desktop (%(platformName)s)": "Riot Desktop (%(platformName)s)",
41+
"Go to your browser to complete Sign In": "Vá para o seu navegador para concluir o login"
2542
}

0 commit comments

Comments
 (0)