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

6358 commits

Author SHA1 Message Date
Tim Hellhake
ee06b25e72 Translated using Weblate (German) 
Currently translated at 99.5% (2276 of 2287 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-06-16 02:28:27 +00:00
Priit Jõerüüt
1959c7b8a5 Translated using Weblate (Estonian) 
Currently translated at 61.3% (1401 of 2287 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-06-16 02:28:27 +00:00
Jeff Huang
1dfed68727 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2287 of 2287 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-06-16 02:28:24 +00:00
Michael Telatynski
3217becce8 i18n 2020-06-16 00:52:52 +01:00
Weblate
ef0b392a0b Merge branch 'origin/develop' into Weblate. 2020-06-15 11:51:10 +00:00
Michael Albert
8d0b9f46d3 Translated using Weblate (German) 
Currently translated at 99.7% (2278 of 2285 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-06-15 11:51:09 +00:00
Jorik Schellekens
94f52c4ee2
Merge pull request #4731 from matrix-org/joriks/radio-buttons 
Change theme selector to use new styled radio buttons
 2020-06-15 12:51:02 +01:00
David Baker
8ebae4c3b6
Merge pull request #4686 from matrix-org/dbkr/recovery_keys_over_passphrases 
Use recovery keys over passphrases
 2020-06-15 11:30:30 +01:00
call_xz
b7036ce183 Translated using Weblate (Japanese) 
Currently translated at 56.7% (1295 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2020-06-15 08:30:32 +00:00
random
5b1a3bf14d Translated using Weblate (Italian) 
Currently translated at 99.9% (2281 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-06-15 08:30:32 +00:00
Kévin C
1386419c6e Translated using Weblate (French) 
Currently translated at 100.0% (2282 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-15 08:30:31 +00:00
Priit Jõerüüt
523da0de72 Translated using Weblate (Estonian) 
Currently translated at 59.7% (1362 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-06-15 08:30:31 +00:00
Jeff Huang
efe2540090 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2282 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-06-15 08:30:28 +00:00
Slavi Pantaleev
ab0cf5dba7 Translated using Weblate (Bulgarian) 
Currently translated at 99.7% (2276 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2020-06-15 08:30:27 +00:00
Osoitz
3d2f4cd747 Translated using Weblate (Basque) 
Currently translated at 100.0% (2282 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-06-15 08:30:26 +00:00
Besnik Bleta
bb4d5f2ae9 Translated using Weblate (Albanian) 
Currently translated at 99.8% (2278 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-06-15 08:30:22 +00:00
Weblate
3d692353b6 Merge branch 'origin/develop' into Weblate. 2020-06-12 14:40:28 +00:00
Michael Albert
0508806a80 Translated using Weblate (German) 
Currently translated at 99.8% (2276 of 2280 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-06-12 14:38:16 +00:00
Jeff Huang
c6f9fae455 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2280 of 2280 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-06-12 14:38:15 +00:00
Travis Ralston
4aa15ee191 Wire up the context menu to the room list store 
Updates are passed along magically to the sublist, so we don't need to listen for the room list store's response to our changes.

This just hits the functions introduced in the last commit.
 2020-06-11 22:04:10 -06:00
MamasLT
9ab9e560dc Translated using Weblate (Lithuanian) 
Currently translated at 72.4% (1650 of 2280 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2020-06-11 22:43:07 +00:00
Szimszon
672c14763c Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2280 of 2280 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-06-11 22:42:58 +00:00
MamasLT
f300f498bb Translated using Weblate (Lithuanian) 
Currently translated at 68.6% (1565 of 2280 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2020-06-11 18:33:22 +00:00
MamasLT
f540c83af8 Translated using Weblate (Lithuanian) 
Currently translated at 68.6% (1565 of 2280 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2020-06-11 18:33:22 +00:00
random
2e99143b79 Translated using Weblate (Italian) 
Currently translated at 99.9% (2279 of 2280 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-06-11 16:34:49 +00:00
XoseM
8839a86288 Translated using Weblate (Galician) 
Currently translated at 69.7% (1590 of 2280 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-11 16:34:48 +00:00
Kévin C
42855cf9d8 Translated using Weblate (French) 
Currently translated at 100.0% (2280 of 2280 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-11 16:34:42 +00:00
Besnik Bleta
51537a527b Translated using Weblate (Albanian) 
Currently translated at 99.9% (2278 of 2280 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-06-11 16:34:41 +00:00
Jorik Schellekens
cf392af52f Address design issues and set theme at device level 2020-06-11 12:27:09 +01:00
Jorik Schellekens
0f685eb0e9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/radio-buttons 2020-06-11 11:03:54 +01:00
Weblate
b1ec954586 Merge branch 'origin/develop' into Weblate. 2020-06-11 01:10:56 +00:00
Jeff Huang
07d3b3f354 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2278 of 2278 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-06-11 01:10:56 +00:00
Travis Ralston
6ccb566587 Show message previews on the new room list tiles 
They're heavily cached.
 2020-06-10 18:37:59 -06:00
Priit Jõerüüt
b545d55e7b Translated using Weblate (Estonian) 
Currently translated at 57.9% (1319 of 2278 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-06-10 21:51:23 +00:00
Weblate
91d37cfc8e Merge branch 'origin/develop' into Weblate. 2020-06-10 13:46:15 +00:00
Travis Ralston
72bb89d4ee
Merge pull request #4743 from matrix-org/travis/room-list/tile-menu 
Add a context menu to rooms in the new room list
 2020-06-10 07:46:09 -06:00
Weblate
f4fc15e9ac Merge branch 'origin/develop' into Weblate. 2020-06-10 13:43:36 +00:00
Travis Ralston
b1fdfb51cd Fix i18n 2020-06-10 07:43:13 -06:00
Travis Ralston
a3391d9a08 Merge branch 'develop' into travis/room-list/hover-state 2020-06-10 07:42:41 -06:00
Weblate
ec289f33eb Merge branch 'origin/develop' into Weblate. 2020-06-10 13:40:39 +00:00
Travis Ralston
78e1db9d30
Merge pull request #4741 from matrix-org/travis/room-list/resize-handle 
Update resize handle for new designs in new room list
 2020-06-10 07:40:34 -06:00
Weblate
88670fd0e4 Merge branch 'origin/develop' into Weblate. 2020-06-10 13:40:03 +00:00
Imre Kristoffer Eilertsen
05f8a6271f Translated using Weblate (Norwegian Bokmål) 
Currently translated at 56.8% (1288 of 2268 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
 2020-06-10 11:34:46 +00:00
random
5e0b30edbc Translated using Weblate (Italian) 
Currently translated at 100.0% (2268 of 2268 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-06-10 11:34:45 +00:00
Michael Albert
c9f0da975d Translated using Weblate (German) 
Currently translated at 99.8% (2264 of 2268 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-06-10 11:34:45 +00:00
jadiof
18d5b4c769 Translated using Weblate (German) 
Currently translated at 99.8% (2264 of 2268 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-06-10 11:34:44 +00:00
Kévin C
0a09b60eeb Translated using Weblate (French) 
Currently translated at 100.0% (2268 of 2268 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-10 11:34:43 +00:00
Priit Jõerüüt
288b3ff46c Translated using Weblate (Estonian) 
Currently translated at 58.0% (1315 of 2268 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-06-10 11:34:43 +00:00
Jeff Huang
ac2ca579cf Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2268 of 2268 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-06-10 11:34:42 +00:00
Slavi Pantaleev
2ae5d4d6c6 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (2268 of 2268 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2020-06-10 11:34:42 +00:00
Besnik Bleta
1ef5da1e4b Translated using Weblate (Albanian) 
Currently translated at 99.9% (2266 of 2268 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-06-10 11:34:34 +00:00
Travis Ralston
0755b4c148 Add a context menu to rooms in the new room list 
The tag options are not implemented out of concern for diff size. 

This splits the context menu classes out to a new "iconized" style which is common across a number of context menus, including the UserMenu.

Some of the badge/sublist styles had to change to better accommodate the menu icon lining up.

This also contains the framework required for https://github.com/vector-im/riot-web/issues/13961
 2020-06-09 23:09:15 -06:00
Travis Ralston
111394df6d Add hover states and basic context menu to new room list 
The 'sort by' radio buttons are blocked by https://github.com/matrix-org/matrix-react-sdk/pull/4731 as it contains the styles needed.

The 'unread rooms' checkbox is intentionally not hooked up. This is a more complicated refactoring that needs to be done.

The message preview checkbox works, though the previews remain hardcoded in this change. The primary intent of this change is to have a good enough context menu and the hover states.

The hover states are as described in the design.
 2020-06-09 21:12:49 -06:00
Travis Ralston
8ec6d4ce76 Appease i18n 2020-06-09 19:53:07 -06:00
Travis Ralston
5f8b7187cf Update resize handle for new designs 
The diff should have information on what this does and how it is supposed to work.
 2020-06-09 19:48:31 -06:00
Travis Ralston
9377fa513f Merge branch 'develop' into travis/room-list/breadcrumbs 2020-06-09 08:11:08 -06:00
Weblate
d71478d281 Merge branch 'origin/develop' into Weblate. 2020-06-09 13:59:18 +00:00
Kévin C
c0b147e76f Translated using Weblate (French) 
Currently translated at 100.0% (2260 of 2260 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-09 12:16:23 +00:00
Jeff Huang
ee5b9be34d Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2260 of 2260 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-06-09 12:16:23 +00:00
Travis Ralston
6c4c581f8f i18n 2020-06-08 20:51:51 -06:00
Travis Ralston
bcc455b248 Merge branch 'develop' into travis/room-list/breadcrumbs 2020-06-08 18:11:42 -06:00
Weblate
5df07e10ea Merge branch 'origin/develop' into Weblate. 2020-06-09 00:10:10 +00:00
Weblate
658d37eb69 Merge branch 'origin/develop' into Weblate. 2020-06-09 00:10:00 +00:00
Nils Haugen
87d5988d53 Translated using Weblate (Norwegian Nynorsk) 
Currently translated at 58.5% (1322 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
 2020-06-09 00:10:00 +00:00
Priit Jõerüüt
0e6e76ad85 Translated using Weblate (Estonian) 
Currently translated at 58.1% (1312 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-06-09 00:09:57 +00:00
J. A. Durieux
8292ce56b0 Translated using Weblate (Dutch) 
Currently translated at 90.1% (2036 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-06-09 00:09:56 +00:00
Travis Ralston
0354bf9b6d Reimplement breadcrumbs for new room list 
This all-new component handles breadcrumbs a bit more smoothly for the app by always listening to changes even if the component isn't present. This allows the breadcrumbs to remain up to date for when the user re-enables breadcrumbs.

The new behaviour is that we turn breadcrumbs on once the user has a room, and we don't turn it back off for them.

This also introduces a new animation which is more stable and not laggy, though instead of sliding the breadcrumbs pop. This might be undesirable - to be reviewed.
 2020-06-08 17:11:58 -06:00
Jorik Schellekens
a10e71edcf Use styled radio buttons for theme selection 2020-06-08 18:17:02 +01:00
Travis Ralston
fd8c056200 Fix i18n 2020-06-08 09:40:03 -06:00
yuuki-san
4b920c88dc Translated using Weblate (Slovak) 
Currently translated at 68.7% (1552 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2020-06-08 09:58:46 +00:00
Michael Albert
dbc2f9cbfc Translated using Weblate (German) 
Currently translated at 99.7% (2253 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-06-08 09:58:45 +00:00
Travis Ralston
8e0247afe5 Add most of the UI for the new room list's menu button 
Incomplete implementation: buttons don't work, some text is missing, etc
 2020-06-07 22:06:41 -06:00
Nils Haugen
8dfed9e597 Translated using Weblate (Norwegian Nynorsk) 
Currently translated at 56.6% (1278 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
 2020-06-07 19:06:20 +00:00
Imre Kristoffer Eilertsen
43be243033 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 56.8% (1283 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
 2020-06-07 19:06:18 +00:00
notramo
d029696049 Translated using Weblate (Hungarian) 
Currently translated at 99.9% (2256 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-06-07 19:06:17 +00:00
XoseM
36597e23ed Translated using Weblate (Galician) 
Currently translated at 67.3% (1521 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-07 19:06:17 +00:00
Kévin C
1af375ab0e Translated using Weblate (French) 
Currently translated at 100.0% (2259 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-07 19:05:58 +00:00
Tirifto
d960d57721 Translated using Weblate (Esperanto) 
Currently translated at 99.9% (2258 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2020-06-07 19:05:58 +00:00
Jeff Huang
e8c614d01e Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2259 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-06-07 19:05:55 +00:00
Weblate
46c31d190e Merge branch 'origin/develop' into Weblate. 2020-06-05 19:18:05 +00:00
David Baker
b82a893a79 Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases 2020-06-05 16:00:43 +01:00
Travis Ralston
211ad66fea Fix i18n 2020-06-05 08:39:38 -06:00
Travis Ralston
b31a8d494b Merge branch 'travis/room-list/scrolling-resize' into travis/room-list/css-layout 2020-06-05 08:39:19 -06:00
MamasLT
0a1080de5a Translated using Weblate (Lithuanian) 
Currently translated at 67.4% (1522 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2020-06-05 10:03:09 +00:00
Travis Ralston
e90e70bd77 Misc cleanup 2020-06-04 21:43:33 -06:00
Travis Ralston
0c15b2bdb6 Simple structuring of the room list itself 
This covers the larger parts of the design, but doesn't deal with the nuances of hover states, badge sizing, etc.
 2020-06-04 21:21:04 -06:00
XoseM
47df8f2ac0 Translated using Weblate (Galician) 
Currently translated at 53.5% (1208 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-04 14:14:07 +00:00
XoseM
82eb80f0c6 Translated using Weblate (Galician) 
Currently translated at 52.7% (1189 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-04 12:59:19 +00:00
random
9c93e48748 Translated using Weblate (Italian) 
Currently translated at 100.0% (2258 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-06-04 09:16:51 +00:00
Kévin C
db6d60566b Translated using Weblate (French) 
Currently translated at 100.0% (2258 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-04 09:16:51 +00:00
Jeff Huang
39dcc9f23c Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2258 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-06-04 09:16:50 +00:00
Travis Ralston
be4f75bca9 Add a 'show more' button to room lists 2020-06-03 21:53:08 -06:00
Weblate
bfb1dc2938 Merge branch 'origin/develop' into Weblate. 2020-06-03 21:12:19 +00:00
Tirifto
520bb1e6fa Translated using Weblate (Esperanto) 
Currently translated at 100.0% (2257 of 2257 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2020-06-03 16:09:39 +00:00
random
003e75968a Translated using Weblate (Italian) 
Currently translated at 100.0% (2257 of 2257 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-06-03 13:44:13 +00:00
Priit Jõerüüt
677c7aac45 Translated using Weblate (Estonian) 
Currently translated at 57.8% (1304 of 2257 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-06-03 13:44:13 +00:00
David Baker
226abb457e Update copy in encryption upgrade swcreen 2020-06-03 12:24:22 +01:00
David Baker
6f3bfc96ca Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases 2020-06-03 11:01:43 +01:00
Michael Telatynski
eb536ff2f7 Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault 
 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.js
	src/components/views/dialogs/InviteDialog.js
	src/components/views/right_panel/UserInfo.js
	src/createRoom.js
 2020-06-03 10:51:17 +01:00
Weblate
bde8cc7bd6 Merge branch 'origin/develop' into Weblate. 2020-06-03 09:45:52 +00:00