mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 04:51:30 +03:00
Code Issues Projects Releases Packages Wiki Activity
27407 commits 219 branches 562 tags 474 MiB
Commit graph

6730 commits

Author SHA1 Message Date
vejetaryenvampir
f681288292 Translated using Weblate (Turkish) 
Currently translated at 73.8% (1754 of 2378 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/tr/
 2020-07-20 12:46:50 +00:00
Марко М. Костић
782e5a6e98 Translated using Weblate (Serbian) 
Currently translated at 41.1% (978 of 2378 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sr/
 2020-07-20 12:46:45 +00:00
progserega
b1f539f383 Translated using Weblate (Russian) 
Currently translated at 87.3% (2076 of 2378 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ru/
 2020-07-20 12:46:38 +00:00
Kevin Scruff
b02a8c431d Translated using Weblate (Persian) 
Currently translated at 5.2% (123 of 2378 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/fa/
 2020-07-20 12:46:33 +00:00
MamasLT
524acec98e Translated using Weblate (Lithuanian) 
Currently translated at 68.4% (1626 of 2378 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/lt/
 2020-07-20 12:46:32 +00:00
call_xz
bbc2b6bf57 Translated using Weblate (Japanese) 
Currently translated at 56.9% (1354 of 2378 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ja/
 2020-07-20 12:46:32 +00:00
XoseM
f95c3c4bc8 Translated using Weblate (Galician) 
Currently translated at 100.0% (2378 of 2378 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/gl/
 2020-07-20 12:46:32 +00:00
Priit Jõerüüt
0c3948c4e0 Translated using Weblate (Estonian) 
Currently translated at 96.8% (2302 of 2378 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/et/
 2020-07-20 12:46:31 +00:00
Tirifto
da5e53bf89 Translated using Weblate (Esperanto) 
Currently translated at 99.9% (2375 of 2378 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/eo/
 2020-07-20 12:46:29 +00:00
Jeff Huang
71040e94be Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2378 of 2378 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/zh_Hant/
 2020-07-20 12:46:29 +00:00
HOU ChG
2afa32d710 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 60.5% (1439 of 2378 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/zh_Hans/
 2020-07-20 12:46:26 +00:00
linsui
88a6365838 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 60.5% (1439 of 2378 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/zh_Hans/
 2020-07-20 12:46:21 +00:00
Txopi
701787b874 Translated using Weblate (Basque) 
Currently translated at 94.2% (2239 of 2378 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/eu/
 2020-07-20 12:46:20 +00:00
folky born
62a9b5179a Translated using Weblate (Arabic) 
Currently translated at 15.4% (367 of 2378 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ar/
 2020-07-20 12:46:20 +00:00
aalzehla
dccab5ea96 Translated using Weblate (Arabic) 
Currently translated at 15.4% (367 of 2378 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ar/
 2020-07-20 12:46:17 +00:00
Besnik Bleta
71dcc75279 Translated using Weblate (Albanian) 
Currently translated at 99.7% (2371 of 2378 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sq/
 2020-07-20 12:46:17 +00:00
aalzehla
e33fc84d5b Translated using Weblate (Arabic) 
Currently translated at 13.9% (330 of 2378 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ar/
 2020-07-18 15:48:18 +00:00
invertor
79f7899e49 Translated using Weblate (Arabic) 
Currently translated at 13.9% (330 of 2378 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ar/
 2020-07-18 15:48:18 +00:00
Travis Ralston
e03978a7ba Update i18n 2020-07-17 16:29:11 -06:00
call_xz
3fce8df9eb Translated using Weblate (Japanese) 
Currently translated at 56.7% (1348 of 2378 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ja/
 2020-07-17 21:04:45 +00:00
Priit Jõerüüt
ffbcd55182 Translated using Weblate (Estonian) 
Currently translated at 95.5% (2272 of 2378 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/et/
 2020-07-17 21:04:43 +00:00
J. A. Durieux
139508e14b Translated using Weblate (Dutch) 
Currently translated at 85.0% (2022 of 2378 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/nl/
 2020-07-17 21:04:42 +00:00
invertor
ee850095a2 Translated using Weblate (Arabic) 
Currently translated at 13.8% (328 of 2378 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ar/
 2020-07-17 21:04:42 +00:00
aalzehla
ebb63a622c Translated using Weblate (Arabic) 
Currently translated at 13.8% (328 of 2378 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ar/
 2020-07-17 21:04:41 +00:00
Travis Ralston
3c047cecfd Remove core structures for the old room list 2020-07-17 14:17:11 -06:00
Travis Ralston
06336a88b3 Remove setting for old room list 2020-07-17 14:06:30 -06:00
aalzehla
51b668c5eb Translated using Weblate (Arabic) 
Currently translated at 3.6% (86 of 2378 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ar/
 2020-07-17 19:08:36 +00:00
Weblate
b27980064a Merge branch 'origin/develop' into Weblate. 2020-07-17 16:03:48 +00:00
David Baker
5db5bc657c
Merge pull request #4833 from matrix-org/dbkr/weird_cancel_dialog 
Hopefully make cancel dialog a bit less weird
 2020-07-17 17:03:43 +01:00
random
19d63e6dff Translated using Weblate (Italian) 
Currently translated at 100.0% (2380 of 2380 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/it/
 2020-07-17 15:59:32 +00:00
Nikita Epifanov
bc885e2156 Translated using Weblate (Russian) 
Currently translated at 84.3% (2006 of 2380 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ru/
 2020-07-17 12:35:55 +00:00
random
8e194b1990 Translated using Weblate (Italian) 
Currently translated at 100.0% (2380 of 2380 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/it/
 2020-07-17 12:35:54 +00:00
XoseM
da16257718 Translated using Weblate (Galician) 
Currently translated at 100.0% (2380 of 2380 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/gl/
 2020-07-17 12:35:53 +00:00
Priit Jõerüüt
dc136480e2 Translated using Weblate (Estonian) 
Currently translated at 95.1% (2263 of 2380 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/et/
 2020-07-17 12:35:53 +00:00
Slavi Pantaleev
10bd804c28 Translated using Weblate (Bulgarian) 
Currently translated at 96.6% (2300 of 2380 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/bg/
 2020-07-17 12:35:45 +00:00
Priit Jõerüüt
1271d5dde6 Translated using Weblate (Estonian) 
Currently translated at 90.3% (2150 of 2380 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-07-16 22:18:04 +00:00
Weblate
cbfd9585a1 Merge branch 'origin/develop' into Weblate. 2020-07-16 20:50:06 +00:00
Salamandar
ef14459c16 Translated using Weblate (French) 
Currently translated at 99.6% (2369 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-07-16 20:44:28 +00:00
Tirifto
ccacb36574 Translated using Weblate (Esperanto) 
Currently translated at 99.9% (2376 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2020-07-16 20:44:27 +00:00
Travis Ralston
c29da883db Convert room list log setting to a real setting 
To debug https://github.com/vector-im/riot-web/issues/14554 and https://github.com/vector-im/riot-web/issues/14508
 2020-07-16 14:43:43 -06:00
Salamandar
f67ac287d4 Translated using Weblate (French) 
Currently translated at 98.9% (2354 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-07-16 19:01:51 +00:00
Tirifto
d4a0ca5df0 Translated using Weblate (Esperanto) 
Currently translated at 99.6% (2370 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2020-07-16 19:01:50 +00:00
Weblate
66b8d1e4ee Merge branch 'origin/develop' into Weblate. 2020-07-16 14:55:40 +00:00
yuuki-san
19c53e9cee Translated using Weblate (Slovak) 
Currently translated at 70.7% (1682 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2020-07-16 14:34:26 +00:00
XoseM
0dff41492f Translated using Weblate (Galician) 
Currently translated at 100.0% (2379 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-07-16 14:34:23 +00:00
Michael Telatynski
d5f2d43429 Improve Tooltip font/layout consistency 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 15:15:00 +01:00
Michael Telatynski
f2104b59f0 Simplify room sublist context menu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 14:38:04 +01:00
yuuki-san
2b4061ec52 Translated using Weblate (Slovak) 
Currently translated at 69.0% (1642 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2020-07-16 13:35:17 +00:00
random
0665a84416 Translated using Weblate (Italian) 
Currently translated at 100.0% (2379 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-07-16 13:35:13 +00:00
[Redacted]
dc8bbc387b Translated using Weblate (Slovak) 
Currently translated at 67.4% (1604 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2020-07-16 12:17:30 +00:00
yuuki-san
ff619de43a Translated using Weblate (Slovak) 
Currently translated at 67.4% (1603 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2020-07-16 12:06:52 +00:00
yuuki-san
7cfb7da61b Translated using Weblate (Slovak) 
Currently translated at 67.4% (1603 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2020-07-16 11:53:05 +00:00
yuuki-san
d5d0cfe42a Translated using Weblate (Slovak) 
Currently translated at 67.1% (1596 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2020-07-16 11:42:12 +00:00
yuuki-san
df96e4f07a Translated using Weblate (Slovak) 
Currently translated at 67.0% (1595 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2020-07-16 11:41:55 +00:00
yuuki-san
e10f8083c5 Translated using Weblate (Slovak) 
Currently translated at 67.0% (1594 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2020-07-16 11:41:37 +00:00
yuuki-san
1d7314731a Translated using Weblate (Slovak) 
Currently translated at 67.0% (1593 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2020-07-16 11:41:28 +00:00
yuuki-san
e9ade66572 Translated using Weblate (Slovak) 
Currently translated at 67.0% (1593 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2020-07-16 11:41:12 +00:00
yuuki-san
eab61eaf59 Translated using Weblate (Slovak) 
Currently translated at 66.3% (1577 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2020-07-16 11:34:57 +00:00
Szimszon
5c1644d3a4 Translated using Weblate (Hungarian) 
Currently translated at 99.7% (2371 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-07-16 11:34:54 +00:00
jadiof
b998058720 Translated using Weblate (German) 
Currently translated at 97.9% (2329 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-07-16 11:34:54 +00:00
Priit Jõerüüt
1e0c6faa4d Translated using Weblate (Estonian) 
Currently translated at 90.4% (2151 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-07-16 11:34:53 +00:00
Priit Jõerüüt
c713df4e26 Translated using Weblate (Estonian) 
Currently translated at 87.0% (2069 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-07-16 09:47:19 +00:00
Weblate
1c5072ea32 Merge branch 'origin/develop' into Weblate. 2020-07-16 09:21:48 +00:00
Imre Kristoffer Eilertsen
b3e4afb7f6 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 59.2% (1408 of 2377 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
 2020-07-16 09:21:48 +00:00
random
2766ab114c Translated using Weblate (Italian) 
Currently translated at 100.0% (2377 of 2377 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-07-16 09:21:48 +00:00
Szimszon
2aa11e152f Translated using Weblate (Hungarian) 
Currently translated at 99.7% (2369 of 2377 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-07-16 09:21:44 +00:00
Balázs Meskó
8ec3b7583a Translated using Weblate (Hungarian) 
Currently translated at 99.7% (2369 of 2377 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-07-16 09:21:42 +00:00
XoseM
b168ed9077 Translated using Weblate (Galician) 
Currently translated at 100.0% (2377 of 2377 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-07-16 09:21:41 +00:00
Priit Jõerüüt
48aa2e7bb3 Translated using Weblate (Estonian) 
Currently translated at 84.0% (1996 of 2377 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-07-16 09:21:39 +00:00
Tirifto
ed2fdfa243 Translated using Weblate (Esperanto) 
Currently translated at 99.9% (2374 of 2377 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2020-07-16 09:21:22 +00:00
Besnik Bleta
f649edd6aa Translated using Weblate (Albanian) 
Currently translated at 98.7% (2345 of 2377 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-07-16 09:21:12 +00:00
Michael Telatynski
78da0c863a Update copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-15 16:52:10 +01:00
Michael Telatynski
ae17cd3ec6 Add tooltip to Room Tile Icon 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-15 16:46:39 +01:00
Travis Ralston
556da7fe5c Swap out Modular for EMS 2020-07-14 15:47:03 -06:00
Travis Ralston
322d58ba0c Merge branch 'develop' into element 2020-07-14 15:04:17 -06:00
J. Ryan Stinnett
c0a552bfb0 Fix font input branding 2020-07-14 18:04:29 +01:00
J. Ryan Stinnett
f47e94259e Merge branch 'jryans/rename-strings' into 'element' 
Update server dialog, analytics

See merge request new-vector/element/element-web/matrix-react-sdk!7
 2020-07-13 20:43:53 +00:00
Jorik Schellekens
6bf6ae2031 try to fix test 
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/delabs-font-scaling
 2020-07-13 19:08:44 +01:00
J. Ryan Stinnett
995a7879a1 Merge remote-tracking branch 'origin/develop' into element 2020-07-13 18:49:55 +01:00
J. Ryan Stinnett
231c26c8a4 Update CustomServerDialog to use brand token 2020-07-13 17:57:56 +01:00
Michael Telatynski
b3c3ef594e i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-13 16:39:59 +01:00
Jorik Schellekens
59e153e024
Merge branch 'develop' into joriks/delabs-font-scaling 2020-07-13 16:15:52 +01:00
J. Ryan Stinnett
e808cdbe2f Remove translations missing the brand variable 2020-07-10 19:57:01 +01:00
J. Ryan Stinnett
fa55f9fda2 Prune translations for strings that no longer exist 2020-07-10 19:57:01 +01:00
J. Ryan Stinnett
f1ad49e745 Replace brand name in stranslated strings 2020-07-10 19:57:01 +01:00
J. Ryan Stinnett
9085627a28 Use brand name from config in all strings 2020-07-10 19:57:01 +01:00
David Baker
503159c1c8 Merge branch 'dbkr/in-app-rebrand-prompt' into 'element' 
Add in-app rebranding toasts & prompts

See merge request new-vector/element/element-web/matrix-react-sdk!1
 2020-07-10 17:09:17 +00:00
David Baker
8701e9293e Add in-app rebranding toasts & prompts 
Either shows an informational dialog telling you the name has changed,
or a more naggy one if the user needs to log in on a different URL.
The new URL (if any) is hardcoded based on the current URL, and also
with a bonus config param in case other deployments need to do similar.
 2020-07-10 15:32:34 +01:00
Bruno Windels
c2d4e45495 theme name translation 2020-07-09 19:19:19 +02:00
Bruno Windels
d90fc57469 Merge branch 'develop' into element 2020-07-09 17:59:56 +02:00
Jorik Schellekens
1033eda7fb Move irc layout option to advanced 2020-07-09 15:54:44 +01:00
Jorik Schellekens
23754ae2bd i18n 2020-07-08 18:07:01 +01:00
Bruno Windels
7390baf451 Merge branch 'develop' into element 2020-07-08 18:09:38 +02:00
Travis Ralston
eb38d80bd5
Merge pull request #4920 from matrix-org/joriks/room-list-priorities 
Enable options to favourite and low priority rooms
 2020-07-08 10:08:02 -06:00
Jorik Schellekens
53bdddfcdd Fix discrepancies with style 2020-07-08 16:07:38 +01:00
Bruno Windels
7dad56ca86 Merge branch 'develop' into element 2020-07-08 15:50:17 +02:00
Jorik Schellekens
b3f50b6e17 Enable options to favourite and low priority rooms 2020-07-07 23:14:04 +01:00
Jorik Schellekens
527fe24cd6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/room-list-voip 2020-07-07 15:04:22 +01:00
Michael Telatynski
69852ecef4 Merge branches 'develop' and 't3chguy/room-list/123' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/123 
 Conflicts:
	src/components/views/rooms/RoomSublist2.tsx
 2020-07-07 14:10:58 +01:00
Travis Ralston
29aeea2974 Fix i18n 2020-07-06 20:45:36 -06:00
Jorik Schellekens
5176685d20 Implement incoming call box 2020-07-06 23:05:00 +01:00
Jorik Schellekens
1e0ff01d50 De labs font-scaling 2020-07-06 15:43:49 +01:00
David Baker
ac771f6a60 New copy on passphrase cancel dialog 2020-07-06 15:26:40 +01:00
Bruno Windels
08c44333cf Update develop 2020-07-06 09:29:23 +02:00
Michael Telatynski
d366ca12a0 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-06 01:19:00 +01:00
Michael Telatynski
4f1cd82b66 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-05 01:24:22 +01:00
Michael Telatynski
10e547539d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/2 2020-07-01 14:26:56 +01:00
strix aluco
9434923da3 Translated using Weblate (Ukrainian) 
Currently translated at 26.2% (618 of 2355 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
 2020-07-01 13:03:55 +00:00
Michael Albert
1e81049801 Translated using Weblate (German) 
Currently translated at 99.2% (2336 of 2355 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-07-01 13:03:54 +00:00
XoseM
5ca4d352ee Translated using Weblate (Galician) 
Currently translated at 100.0% (2355 of 2355 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-07-01 13:03:53 +00:00
Kévin C
2db0bb570a Translated using Weblate (French) 
Currently translated at 100.0% (2355 of 2355 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-07-01 13:03:50 +00:00
Jeff Huang
f09aa3b09b Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2355 of 2355 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-07-01 13:03:47 +00:00
Michael Telatynski
198958dcdd Iterate to match figma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-30 22:32:59 +01:00
Michael Telatynski
fe4cf9f9b4 Merge branches 'develop' and 't3chguy/room-list/2' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/2 2020-06-30 21:16:37 +01:00
Szimszon
d8bc20932e Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2355 of 2355 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-06-30 19:18:46 +00:00
Besnik Bleta
e83a941140 Translated using Weblate (Albanian) 
Currently translated at 99.9% (2352 of 2355 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-06-30 19:18:41 +00:00
Weblate
e5a7101f1a Merge branch 'origin/develop' into Weblate. 2020-06-30 17:06:17 +00:00
David Baker
2247400010
Merge pull request #4847 from matrix-org/dbkr/recovery_key_upload_2 
Add file upload button to recovery key input
 2020-06-30 18:06:12 +01:00
Weblate
4f899f2d34 Merge branch 'origin/develop' into Weblate. 2020-06-30 16:55:09 +00:00
David Baker
21c5c745c1
Merge pull request #4831 from matrix-org/dbkr/recovery_key_passphrase_2 
Implement new design on security setup & login
 2020-06-30 17:55:03 +01:00
random
41ac980196 Translated using Weblate (Italian) 
Currently translated at 100.0% (2345 of 2345 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-06-30 15:56:46 +00:00
Michael Albert
bf4305f00c Translated using Weblate (German) 
Currently translated at 99.9% (2343 of 2345 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-06-30 15:56:45 +00:00
XoseM
08fa7912b3 Translated using Weblate (Galician) 
Currently translated at 100.0% (2345 of 2345 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-30 15:56:45 +00:00
Kévin C
2d6142d132 Translated using Weblate (French) 
Currently translated at 100.0% (2345 of 2345 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-30 15:56:45 +00:00
Jeff Huang
022cc5ea32 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2345 of 2345 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-06-30 15:56:44 +00:00
Bruno Windels
baebab7b16 Add element theme 2020-06-30 13:28:19 +02:00
Michael Telatynski
54419878fa Add room notifications context menu and non-default indicator to RoomTile2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-30 00:16:51 +01:00
Weblate
8799e649df Merge branch 'origin/develop' into Weblate. 2020-06-29 11:27:30 +00:00
random
88c195e443 Translated using Weblate (Italian) 
Currently translated at 100.0% (2344 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-06-29 11:27:30 +00:00
Michael Albert
02274ed6a6 Translated using Weblate (German) 
Currently translated at 99.9% (2342 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-06-29 11:27:26 +00:00
J. Ryan Stinnett
d1d4bef795
Merge pull request #4622 from aaronraimist/redaction-timestamp 
Show timestamp of redaction on hover
 2020-06-29 11:10:25 +01:00
Weblate
2101f14cd6 Merge branch 'origin/develop' into Weblate. 2020-06-29 02:04:28 +00:00
васян228
57df5e8f6b Translated using Weblate (Russian) 
Currently translated at 85.2% (1996 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-06-29 02:04:28 +00:00
progserega
321d8ef2a1 Translated using Weblate (Russian) 
Currently translated at 85.2% (1996 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-06-29 02:04:27 +00:00
Priit Jõerüüt
80de67eff5 Translated using Weblate (Estonian) 
Currently translated at 75.2% (1762 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-06-29 02:04:27 +00:00
Besnik Bleta
badce33730 Translated using Weblate (Albanian) 
Currently translated at 99.7% (2337 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-06-29 02:04:25 +00:00
Travis Ralston
62467144ba Update i18n 2020-06-28 20:03:55 -06:00
Lizzy
554af62aad Translated using Weblate (Spanish) 
Currently translated at 89.0% (2087 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2020-06-28 04:23:28 +00:00
XoseM
11bc33853c Translated using Weblate (Galician) 
Currently translated at 100.0% (2344 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-28 04:23:26 +00:00
Kévin C
c16f8aaada Translated using Weblate (French) 
Currently translated at 100.0% (2344 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-28 04:23:22 +00:00
Tuomas Hietala
4acf87af0b Translated using Weblate (Finnish) 
Currently translated at 94.8% (2222 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2020-06-28 04:23:18 +00:00
Priit Jõerüüt
2f5fdd045b Translated using Weblate (Estonian) 
Currently translated at 73.8% (1731 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-06-28 04:23:14 +00:00
Jeff Huang
d53535c089 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2344 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-06-28 04:23:06 +00:00
David Baker
04d660517b i18n 2020-06-26 18:58:12 +01:00
David Baker
b74674ced8 Right name for security key and fix cancel button 2020-06-26 18:04:06 +01:00
David Baker
15ebaa1470 Port recovery key upload button to new designs 2020-06-26 15:22:04 +01:00
Weblate
7cd5e75d6c Merge branch 'origin/develop' into Weblate. 2020-06-26 13:33:24 +00:00
Travis Ralston
67cc84d00d Merge branch 'develop' into travis/room-list/preview-copy 2020-06-26 07:29:49 -06:00
XoseM
c0ad857e5c Translated using Weblate (Galician) 
Currently translated at 100.0% (2292 of 2292 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-26 13:25:59 +00:00
David Baker
f4460ca78f Merge remote-tracking branch 'origin/develop' into dbkr/recovery_key_passphrase_2 2020-06-26 13:12:06 +01:00
Weblate
7c6f41b3f4 Merge branch 'origin/develop' into Weblate. 2020-06-26 09:37:42 +00:00
aWeinzierl
b16344582a Translated using Weblate (Spanish) 
Currently translated at 89.4% (2048 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2020-06-26 08:09:56 +00:00
XoseM
2aa791d20a Translated using Weblate (Galician) 
Currently translated at 98.1% (2247 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-26 08:09:56 +00:00
Kévin C
b1b1524866 Translated using Weblate (French) 
Currently translated at 100.0% (2291 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-26 08:09:49 +00:00
Andrew Morgan
87f961df3f Put behind a labs flag 2020-06-26 01:22:46 +01:00
Travis Ralston
acf56559e1 Introduce an entirely new system for handling message preview copy 
This reverts earlier changes made to textForEvent as they are no longer needed.

This also implements an entire tree of textForEvent-like behaviour as the previews need to be different, which is easiest done with its own stack.
 2020-06-25 16:26:49 -06:00
Weblate
c1c22c4818 Merge branch 'origin/develop' into Weblate. 2020-06-25 13:38:24 +00:00
XoseM
4b952737dc Translated using Weblate (Galician) 
Currently translated at 93.7% (2147 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-25 13:38:24 +00:00
XoseM
d5cf4bcfa2 Translated using Weblate (Galician) 
Currently translated at 93.7% (2146 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-25 13:18:32 +00:00
XoseM
5045c0b135 Translated using Weblate (Galician) 
Currently translated at 93.6% (2145 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-25 13:18:03 +00:00
ziriSut
2ef2f76de9 Translated using Weblate (Kabyle) 
Currently translated at 20.1% (460 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/kab/
 2020-06-25 13:11:38 +00:00
Michael Albert
fa3cc28dcc Translated using Weblate (German) 
Currently translated at 99.9% (2289 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-06-25 13:11:37 +00:00
XoseM
aaff3e0bec Translated using Weblate (Galician) 
Currently translated at 92.9% (2128 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-25 13:11:36 +00:00
David Baker
29cdebb611 i18n 2020-06-25 13:26:32 +01:00
David Baker
2b144a846a Apply some of the newer styling to passphrase / recovery key entry 2020-06-25 12:44:15 +01:00
random
b4ab15f91f Translated using Weblate (Italian) 
Currently translated at 99.9% (2290 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-06-24 16:34:52 +00:00
XoseM
1aef7cdfea Translated using Weblate (Galician) 
Currently translated at 91.4% (2095 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-24 16:34:51 +00:00
Jorik Schellekens
0638b94cc2 Move compact checkbox 2020-06-24 16:06:50 +01:00
Weblate
7518fca98b Merge branch 'origin/develop' into Weblate. 2020-06-24 13:04:57 +00:00
David Baker
bf15e96a6a Make pasphrase screen look more like designs 
Although passphrase / passphrase confirm is still split between two
screens because that's more work to change and probably is not a pivotal
part of the UI that needs to change in step with everything else.
 2020-06-24 12:43:56 +01:00
ziriSut
bced934613 Translated using Weblate (Kabyle) 
Currently translated at 19.6% (449 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/kab/
 2020-06-24 10:00:19 +00:00
Szimszon
354e31e7db Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2291 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-06-24 10:00:19 +00:00
XoseM
f1fc81be69 Translated using Weblate (Galician) 
Currently translated at 84.8% (1943 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-24 10:00:18 +00:00
Kévin C
7cb48aac9b Translated using Weblate (French) 
Currently translated at 100.0% (2291 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-24 10:00:17 +00:00
Jeff Huang
bf34d37606 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2291 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-06-24 10:00:16 +00:00
Slavi Pantaleev
dd8109f77a Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (2291 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2020-06-24 10:00:16 +00:00
Travis Ralston
380aed4244 Update profile information in User Menu 
Fixes https://github.com/vector-im/riot-web/issues/14158 (we needed an HTTP avatar URL)
Fixes https://github.com/vector-im/riot-web/issues/14159
Fixes https://github.com/vector-im/riot-web/issues/14157
Also fixes an issue where it wasn't updating automatically when the user changed their profile info.

This is all achieved through a new OwnProfileStore which does the heavy lifting, as we have to keep at least 2 components updated.
 2020-06-23 21:01:50 -06:00
Weblate
001abf40fb Merge branch 'origin/develop' into Weblate. 2020-06-23 19:38:12 +00:00
XoseM
a915da650a Translated using Weblate (Galician) 
Currently translated at 84.0% (1924 of 2290 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-23 19:38:12 +00:00
Besnik Bleta
cc60fff198 Translated using Weblate (Albanian) 
Currently translated at 99.9% (2288 of 2290 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-06-23 19:38:09 +00:00
Hubert Chathi
74e4ea7d48
Merge pull request #4797 from matrix-org/uhoreg/distrust_backup 
Mark messages with a black shield if the megolm session isn't trusted
 2020-06-23 15:38:03 -04:00
David Baker
3716f9d82c Fix cancel button / prompt 2020-06-23 16:43:52 +01:00
David Baker
0694776b25 Update the 'save your security key' screen 2020-06-23 16:27:41 +01:00
Weblate
edc384ac92 Merge branch 'origin/develop' into Weblate. 2020-06-23 14:38:55 +00:00
ziriSut
84bcd98d17 Translated using Weblate (Kabyle) 
Currently translated at 19.6% (449 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/kab/
 2020-06-23 14:20:32 +00:00
random
6255c67d4f Translated using Weblate (Italian) 
Currently translated at 99.9% (2287 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-06-23 14:20:26 +00:00
Kévin C
c5da3d726d Translated using Weblate (French) 
Currently translated at 100.0% (2288 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-23 14:20:25 +00:00
Priit Jõerüüt
876e7799ba Translated using Weblate (Estonian) 
Currently translated at 70.2% (1606 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-06-23 14:20:25 +00:00
Jeff Huang
07cbf23b22 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2288 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-06-23 14:20:20 +00:00
David Baker
6ce8584337 Implement first screen (recovery key / passphrase choice) 2020-06-23 15:04:39 +01:00
ziriSut
22269de5b0 Translated using Weblate (Kabyle) 
Currently translated at 9.7% (223 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/kab/
 2020-06-22 22:16:20 +00:00
ziriSut
3054e6579a Translated using Weblate (Kabyle) 
Currently translated at 8.4% (192 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/kab/
 2020-06-22 19:51:33 +00:00
Priit Jõerüüt
326f336425 Translated using Weblate (Estonian) 
Currently translated at 68.9% (1576 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-06-22 19:51:32 +00:00
Michael Albert
585af6ee84 Translated using Weblate (German) 
Currently translated at 99.7% (2281 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-06-22 18:22:10 +00:00
Priit Jõerüüt
d875c3170d Translated using Weblate (Estonian) 
Currently translated at 67.3% (1539 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-06-22 18:22:10 +00:00
Besnik Bleta
2319b25484 Translated using Weblate (Albanian) 
Currently translated at 99.9% (2286 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-06-22 18:22:08 +00:00
Slimane Selyan AMIRI
4db2ede67f Translated using Weblate (Kabyle) 
Currently translated at 7.7% (177 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/kab/
 2020-06-22 15:41:20 +00:00
Jorik Schellekens
d54676aefe Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/appearance-advanced 2020-06-22 15:35:48 +01:00
Jorik Schellekens
086177d808
Merge pull request #4770 from matrix-org/joriks/font-scaling-message-preview 
Add message preview for font slider
 2020-06-22 11:43:52 +01:00
Jorik Schellekens
2294d23b32
Merge branch 'develop' into joriks/appearance-advanced 2020-06-22 11:27:48 +01:00