David Baker
465948e402
Merge pull request #4607 from matrix-org/dbkr/remove_rageshake_ssss_key_upgrade_check
...
Remove SSSS key upgrade check from rageshake
2020-05-19 15:58:03 +01:00
David Baker
4bf2e5fd8e
Remove SSSS key upgrade check from rageshake
...
This code doesn't exist anymore as the SSSS symmetric upgrade stuff
has been removed.
Fixes https://github.com/vector-im/riot-web/issues/13715
2020-05-19 15:40:26 +01:00
Weblate
87b0c09b0c
Merge branch 'origin/develop' into Weblate.
2020-05-19 10:58:05 +00:00
rkfg
3cd0381202
Translated using Weblate (Russian)
...
Currently translated at 89.8% (2075 of 2311 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-05-19 10:58:05 +00:00
Michael Telatynski
e7d37228f2
Merge pull request #4603 from matrix-org/t3chguy/add_room_tooltip
...
Label the create room button better than "Add room"
2020-05-19 11:57:59 +01:00
Weblate
2700fa9515
Merge branch 'origin/develop' into Weblate.
2020-05-19 10:25:16 +00:00
RiotRobot
833eccf5cd
Reset matrix-js-sdk back to develop branch
2020-05-19 11:25:07 +01:00
Weblate
3e3ddd4263
Merge branch 'origin/develop' into Weblate.
2020-05-19 10:24:42 +00:00
Priit Jõerüüt
82ca614fa7
Translated using Weblate (Estonian)
...
Currently translated at 53.6% (1239 of 2311 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
2020-05-19 10:24:42 +00:00
RiotRobot
19e496cacc
Merge branch 'master' into develop
2020-05-19 11:23:16 +01:00
RiotRobot
26e6447be5
v2.6.0
2020-05-19 11:22:00 +01:00
RiotRobot
bc8a53a7d7
Prepare changelog for v2.6.0
2020-05-19 11:21:59 +01:00
RiotRobot
406839e89a
Upgrade matrix-js-sdk to 6.1.0
2020-05-19 11:13:57 +01:00
Travis Ralston
38920e7f30
Merge branch 'develop' into travis/room-list-2
2020-05-18 23:23:59 -06:00
Weblate
86dca5292c
Merge branch 'origin/develop' into Weblate.
2020-05-19 05:22:44 +00:00
yuuki-san
b9c31b27a2
Translated using Weblate (Slovak)
...
Currently translated at 64.9% (1500 of 2311 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2020-05-19 05:22:44 +00:00
Travis Ralston
9aff2e836e
Merge pull request #4593 from matrix-org/travis/dispatcher-types
...
Convert the dispatcher to TypeScript
2020-05-18 23:22:32 -06:00
Jorik Schellekens
7bb7f30b8f
missed one
2020-05-18 22:02:22 +01:00
Jorik Schellekens
bba6b2c441
Appease i18n
2020-05-18 17:06:54 +01:00
Jorik Schellekens
4deeef5fca
Remove ability to remove avatars
2020-05-18 16:57:00 +01:00
Jorik Schellekens
5380e76b7b
lint
2020-05-18 16:43:47 +01:00
Jorik Schellekens
17f535e5f8
Fix review problems
...
- removed superfluous position and classes
- fixed compact view
- fixed event list summary avatar and text overlap
- fixed a problem where the mention list refuses to load.
2020-05-18 16:37:10 +01:00
Weblate
89297a5133
Merge branch 'origin/develop' into Weblate.
2020-05-18 10:08:16 +00:00
yuuki-san
a8e92589ad
Translated using Weblate (Slovak)
...
Currently translated at 62.7% (1450 of 2312 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2020-05-18 10:08:16 +00:00
Michael Telatynski
1eea203db6
Merge pull request #4599 from matrix-org/t3chguy/progress_colour
...
Consolidate password/passphrase fields into a component & add dynamic colour to progress
2020-05-18 11:08:08 +01:00
Michael Telatynski
54640dcaac
Merge pull request #4590 from matrix-org/t3chguy/userview
...
UserView, show Welcome page in the mid panel instead of empty space
2020-05-18 11:07:49 +01:00
Michael Telatynski
a864643d98
Label the create room button something better than "Add room"
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-18 10:37:02 +01:00
Michael Telatynski
657c10f1b5
Merge pull request #4602 from matrix-org/t3chguy/cherry-pick/5
...
Revert "ImageView make clicking off it easier"
2020-05-18 10:24:57 +01:00
David Baker
0191e0710c
Merge pull request #4601 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate
2020-05-18 10:23:35 +01:00
Michael Telatynski
b6ac8cb28d
Revert "ImageView make clicking off it easier"
...
(cherry picked from commit 52e3c97f8c
)
2020-05-18 10:15:30 +01:00
yuuki-san
5ea4cc1c5b
Translated using Weblate (Slovak)
...
Currently translated at 62.3% (1441 of 2312 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2020-05-18 09:14:53 +00:00
Xose M
7c5842c208
Translated using Weblate (Galician)
...
Currently translated at 40.0% (925 of 2312 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2020-05-18 09:14:52 +00:00
Priit Jõerüüt
0662c231a5
Translated using Weblate (Estonian)
...
Currently translated at 53.3% (1233 of 2312 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
2020-05-18 09:14:51 +00:00
Pepper.Cabbit.Snoopy
3ffa333f31
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 62.7% (1450 of 2312 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2020-05-18 09:14:47 +00:00
Priit Jõerüüt
0feb55ff4f
Translated using Weblate (Estonian)
...
Currently translated at 51.4% (1188 of 2312 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
2020-05-16 18:06:27 +00:00
Szimszon
c09745e183
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (2312 of 2312 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-05-16 07:22:08 +00:00
Travis Ralston
798e7a1f86
Merge branch 'develop' into travis/dispatcher-types
2020-05-15 09:56:02 -06:00
Weblate
7260e34d1c
Merge branch 'origin/develop' into Weblate.
2020-05-15 13:33:32 +00:00
random
16bdbfd67d
Translated using Weblate (Italian)
...
Currently translated at 100.0% (2312 of 2312 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-05-15 13:33:32 +00:00
Szimszon
ae9d700c93
Translated using Weblate (Hungarian)
...
Currently translated at 99.4% (2299 of 2312 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-05-15 13:33:31 +00:00
Kévin C
b27ac71680
Translated using Weblate (French)
...
Currently translated at 100.0% (2312 of 2312 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-05-15 13:33:31 +00:00
Tuomas Hietala
7d15fea5f9
Translated using Weblate (Finnish)
...
Currently translated at 91.2% (2108 of 2312 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2020-05-15 13:33:30 +00:00
Priit Jõerüüt
9542851c25
Translated using Weblate (Estonian)
...
Currently translated at 50.9% (1176 of 2312 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
2020-05-15 13:33:29 +00:00
Tirifto
acfacb9b95
Translated using Weblate (Esperanto)
...
Currently translated at 100.0% (2312 of 2312 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2020-05-15 13:33:27 +00:00
Jeff Huang
7ae10d0ba8
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (2312 of 2312 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-05-15 13:33:27 +00:00
Besnik Bleta
4ef32598ed
Translated using Weblate (Albanian)
...
Currently translated at 99.9% (2309 of 2312 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-05-15 13:33:26 +00:00
David Baker
07eed94b35
Merge pull request #4600 from matrix-org/dbkr/fix_email_sent_to_blank
...
Make email auth component fail better if server claims email isn't validated
2020-05-15 14:33:20 +01:00
David Baker
523067e5f9
Make email auth component fail better if server claims email isn't validated
...
https://github.com/matrix-org/synapse/issues/7512 means that (at least)
sometimes after clicking on the email validation link and being redirected
to riot, the server will claim the email identity auth stage is still incomplete.
This meant that we displayed the email identity UIA component but with an empty
email address, because we don't know that in the new session. Work around this by
assuming that if the email UIA component is being displayed but we don't have an
email address input, the link has been clicked and we're just waiting for the poll.
Also don't fire off an initial register request if we're already mid-UI-auth, because
that's confusing and unnecessary.
Also also remove unused requestingToken state.
Fixes https://github.com/vector-im/riot-web/issues/13434
2020-05-15 13:32:12 +01:00
Michael Telatynski
e79959a4ec
try fix tests
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-15 00:31:30 +01:00
Michael Telatynski
59f1657b43
Add jest-canvas-mock
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-15 00:25:19 +01:00