Commit graph

25443 commits

Author SHA1 Message Date
Travis Ralston
559dd98d01 Fix comment style to be less bothersome 2020-05-21 11:53:16 -06:00
Michael Telatynski
099c06c6e5 Merge branches 'develop' and 't3chguy-patch-1' of github.com:matrix-org/matrix-react-sdk into t3chguy-patch-1 2020-05-21 18:31:00 +01:00
Michael Telatynski
3ae38714c1 make ts happy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-21 18:25:52 +01:00
Michael Telatynski
7b0e51a703 delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-21 18:11:21 +01:00
Michael Telatynski
b27f1fa6db Convert BasePlatform and BaseEventIndexManager to Typescript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-21 18:06:36 +01:00
Michael Telatynski
f539a960e1 re-add brackets
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-21 17:50:32 +01:00
Michael Telatynski
1dfd62c142 iterate alignment
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-21 17:47:35 +01:00
Michael Telatynski
6a0ffe905f Iterate text alignment
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-21 17:12:16 +01:00
Michael Telatynski
5995a27ced Iterate paddings
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-21 16:52:36 +01:00
Michael Telatynski
7e7c48e046 Improve style of toasts to match Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-21 16:32:19 +01:00
Weblate
9cb1c18367 Merge branch 'origin/develop' into Weblate. 2020-05-21 11:54:51 +00:00
yuuki-san
6d92f54934 Translated using Weblate (Slovak)
Currently translated at 66.7% (1547 of 2321 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2020-05-21 11:54:51 +00:00
MamasLT
a3e790d72c Translated using Weblate (Lithuanian)
Currently translated at 47.0% (1090 of 2321 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2020-05-21 11:54:48 +00:00
yuuki-san
53d90234c3 Translated using Weblate (Czech)
Currently translated at 94.7% (2198 of 2321 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2020-05-21 11:54:46 +00:00
David Baker
7533a8f80b
Merge pull request #4612 from matrix-org/dbkr/fix_restore_with_ssss
Fix key backup restore with SSSS
2020-05-21 12:54:41 +01:00
David Baker
5d1c01fd6f Fix key backup restore with SSSS
The room / session ID params come after the backupInfo for restoring
from SSSS so the options object was being passed into the wrong param.
Roll on TypeScript.

This meant restoring backups worked fine when the key was cached but
failed when it wasn't.

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4507
2020-05-21 12:26:27 +01:00
Weblate
9ab04998be Merge branch 'origin/develop' into Weblate. 2020-05-21 10:07:33 +00:00
yuuki-san
3b353f1e7a Translated using Weblate (Slovak)
Currently translated at 65.3% (1515 of 2321 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2020-05-21 10:07:32 +00:00
MamasLT
0409932b4d Translated using Weblate (Lithuanian)
Currently translated at 46.4% (1076 of 2321 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2020-05-21 10:07:31 +00:00
random
23bfa6f11e Translated using Weblate (Italian)
Currently translated at 100.0% (2321 of 2321 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-05-21 10:07:29 +00:00
Kévin C
4c39b6a988 Translated using Weblate (French)
Currently translated at 100.0% (2321 of 2321 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-05-21 10:07:29 +00:00
Tirifto
19b9776e89 Translated using Weblate (Esperanto)
Currently translated at 100.0% (2321 of 2321 strings)

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

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-05-21 10:07:27 +00:00
Besnik Bleta
2828cc1d25 Translated using Weblate (Albanian)
Currently translated at 99.9% (2318 of 2321 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-05-21 10:07:26 +00:00
poljar
af286ade4e
Merge pull request #4608 from matrix-org/poljar/eventindex-null-token
Handle null tokens in the crawler loop.
2020-05-21 12:07:18 +02:00
Michael Telatynski
5618c382bd
Update code style to mention switch statements 2020-05-20 16:01:34 +01:00
Weblate
b1f288926e Merge branch 'origin/develop' into Weblate. 2020-05-20 14:29:56 +00:00
MamasLT
a40d795153 Translated using Weblate (Lithuanian)
Currently translated at 45.8% (1059 of 2314 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2020-05-20 14:29:56 +00:00
random
31ac5aaa77 Translated using Weblate (Italian)
Currently translated at 100.0% (2314 of 2314 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-05-20 14:29:54 +00:00
Xose M
1f75caf6d2 Translated using Weblate (Galician)
Currently translated at 41.1% (950 of 2314 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2020-05-20 14:29:54 +00:00
Kévin C
a462a374cb Translated using Weblate (French)
Currently translated at 100.0% (2314 of 2314 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-05-20 14:29:52 +00:00
Samu Voutilainen
402c1b0d65 Translated using Weblate (Finnish)
Currently translated at 94.3% (2183 of 2314 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2020-05-20 14:29:52 +00:00
Tirifto
48a66a817f Translated using Weblate (Esperanto)
Currently translated at 100.0% (2314 of 2314 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2020-05-20 14:29:46 +00:00
Jeff Huang
b0e0073970 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2314 of 2314 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-05-20 14:29:46 +00:00
Jorik Schellekens
d95d0191a2
Merge pull request #4424 from JorikSchellekens/joriks/font-scaling-slider
Font scaling settings and slider
2020-05-20 15:29:36 +01:00
Jorik Schellekens
50a44405f0 CONSTANT_CASING 2020-05-20 15:17:47 +01:00
Jorik Schellekens
adec5a4f92 fix test 2020-05-20 15:09:10 +01:00
Jorik Schellekens
4e9a139e8b lint 2020-05-20 14:49:18 +01:00
Jorik Schellekens
82b76192ae Fixes, lints and i18n 2020-05-20 14:44:56 +01:00
Jorik Schellekens
6d9d4ee547 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-05-20 13:46:17 +01:00
Jorik Schellekens
55e72dd5bf Remove min and max font setting 2020-05-20 13:45:54 +01:00
Jorik Schellekens
3e30df17fb Slider is more responsive 2020-05-20 13:07:33 +01:00
Damir Jelić
db72c645ba EventIndex: Add a missing semicolon. 2020-05-20 11:14:37 +02:00
Damir Jelić
86ad6de41e EventIndex: Handle null tokens in the crawler loop as well.
This is similar to 5eb510387c. But now the
checkpoint arrived during a crawl.
2020-05-20 11:06:52 +02:00
Weblate
415eff127f Merge branch 'origin/develop' into Weblate. 2020-05-19 21:29:03 +00:00
Travis Ralston
b96c1ada8a
Merge pull request #4494 from pv/auxpanel-scrolling-persisted
Prevent PersistedElements overflowing scrolled areas
2020-05-19 15:28:58 -06:00
Weblate
1caaa67850 Merge branch 'origin/develop' into Weblate. 2020-05-19 17:44:04 +00:00
Jorik Schellekens
5a1bf03053
Merge pull request #4531 from JorikSchellekens/joriks/irc-ui
IRC ui layout
2020-05-19 18:43:58 +01:00
Jorik Schellekens
323d0762fc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/irc-ui 2020-05-19 18:03:44 +01:00
Jorik Schellekens
2e325191bc Merge remote-tracking branch 'nv/develop' into joriks/irc-ui 2020-05-19 17:18:36 +01:00