63695 Commits

Author SHA1 Message Date
Robert Swain 880e7149f3 ModularWidgets: Add a quick VR demo widget 2017-06-14 13:05:43 +02:00
Luke Barnard f25c081007 When not specified, remove roomAlias state in RoomViewStore 2017-06-14 12:05:25 +01:00
GrigRUSS a2322853a1 Translated using Weblate (Russian)
Currently translated at 100.0% (906 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-06-14 10:47:18 +00:00
GrigRUSS c01df23040 Translated using Weblate (Russian)
Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
2017-06-14 10:44:43 +00:00
David Baker d22e99345f Merge branch 'master' into develop 2017-06-14 11:24:53 +01:00
David Baker 4edd21ba8a v0.11.1 v0.11.1 2017-06-14 11:21:27 +01:00
David Baker 90cff5d7bf Prepare changelog for v0.11.1 2017-06-14 11:21:27 +01:00
David Baker 9325eef650 v0.11.1 2017-06-14 11:20:05 +01:00
Tom Tryfonidis 7983f9af87 Translated using Weblate (Greek)
Currently translated at 96.7% (877 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/
2017-06-14 10:19:45 +00:00
David Baker f9795232e0 react-sdk 0.9.4 2017-06-14 11:19:43 +01:00
David Baker 74a74bc75d Merge branch 'master' into develop 2017-06-14 11:18:56 +01:00
Krombel b916bc97b1 Translated using Weblate (German)
Currently translated at 100.0% (906 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-06-14 10:17:13 +00:00
David Baker a5aa497287 v0.9.4 2017-06-14 11:17:00 +01:00
David Baker 1b41401ed6 Prepare changelog for v0.9.4 2017-06-14 11:17:00 +01:00
Richard van der Hoff 5d649626b0 Merge remote-tracking branch 'origin/develop' into rav/no_resume_client_on_login 2017-06-14 11:08:16 +01:00
Richard van der Hoff 498ea53995 Don't create a guest login if user went to /login
This fixes an unintuitive behaviour where, if you follow a link to
riot.im/app/#/login, we take you to the login page, but not before we've
registered a guest account (or restarted the MatrixClient with the stored
creds).

This actually ends up simplifying some of the startup dance, as we special-case
the registration flows earlier on.
2017-06-14 11:02:38 +01:00
David Baker 5c426746b4 Merge pull request #1091 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-06-14 10:57:19 +01:00
David Baker c3ef2f86d6 Merge pull request #4305 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
2017-06-14 10:56:22 +01:00
David Baker 11c04abaeb Merge pull request #4305 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
2017-06-14 10:55:42 +01:00
David Baker 2a51aec193 Merge pull request #1091 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-06-14 10:55:24 +01:00
Luke Barnard 57dfbc4701 Remove unused imports 2017-06-14 10:53:02 +01:00
Luke Barnard 040f28463d Merge pull request #1045 from ollieh/issues/4009
Fixed pagination infinite loop caused by long messages
2017-06-14 10:40:02 +01:00
Weblate 5d93c675e1 Merge remote-tracking branch 'origin/develop' into develop 2017-06-14 09:34:58 +00:00
Brendan Abolivier 452e35caa1 Translated using Weblate (French)
Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
2017-06-14 09:34:58 +00:00
Richard van der Hoff d7fb0093e4 Merge pull request #4292 from vector-im/rav/clear_storage_on_login
Test that we handle stored mx_last_room_id correctly
2017-06-14 10:34:55 +01:00
Richard van der Hoff 9e70884415 Merge pull request #1085 from matrix-org/rav/clear_storage_on_login
Clear persistent storage on login and logout
2017-06-14 10:34:26 +01:00
David Baker d5a6ba225a DM guessing: prefer oldest joined member
In the DM guessing code, prefer the oldest joined member if there's
anyone in the rom other than us. Otherwise, fall back to the old
behaviour.

Fixes https://github.com/vector-im/riot-web/issues/4288
2017-06-14 10:31:06 +01:00
David Baker b4e216ba23 Merge pull request #1087 from matrix-org/dbkr/dm_guess_oldest_joined
DM guessing: prefer oldest joined member
2017-06-14 10:30:46 +01:00
Weblate 755005b1c6 Merge remote-tracking branch 'origin/develop' into develop 2017-06-14 09:30:04 +00:00
Luke Barnard 58a323b391 i18n for setting email after password flow 2017-06-14 10:18:48 +01:00
Luke Barnard 79c2977f13 Trailing comma 2017-06-14 10:17:57 +01:00
Luke Barnard df43c521f3 i18n for setting password flow 2017-06-14 10:17:50 +01:00
Brendan Abolivier 9495d5b631 Translated using Weblate (French)
Currently translated at 100.0% (906 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-14 09:15:22 +00:00
Luke Barnard 01e71163da Ask for email address after setting password for the first time
So that the user can reset their password.
2017-06-14 09:59:26 +01:00
Luke Barnard cd8dc5f178 Ask for email address after setting password for the first time
This is so that the user can reset their password.
2017-06-14 09:58:55 +01:00
Weblate ea9aae3902 Merge remote-tracking branch 'origin/develop' into develop 2017-06-14 08:57:24 +00:00
AmandineLP 23c6ccc536 Translated using Weblate (French)
Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
2017-06-14 08:57:24 +00:00
Paul Evans fa9ae945ed Translated using Weblate (Esperanto)
Currently translated at 21.5% (43 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
2017-06-14 08:57:24 +00:00
David Baker 9d42a81709 Merge pull request #4301 from vector-im/luke/set-email-after-password-2
Ask for email address after setting password for the first time
2017-06-14 09:57:21 +01:00
David Baker 0566e5d992 Merge pull request #1090 from matrix-org/luke/set-email-after-password-2
Ask for email address after setting password for the first time
2017-06-14 09:57:07 +01:00
Tom Tryfonidis 46d0e8da96 Translated using Weblate (Greek)
Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/el/
2017-06-14 08:42:05 +00:00
Weblate 7ba2d19249 Merge remote-tracking branch 'origin/develop' into develop 2017-06-14 08:32:39 +00:00
Walter 84d89ba519 Translated using Weblate (Russian)
Currently translated at 99.7% (902 of 904 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-06-14 08:32:39 +00:00
Bamstam 10a4d128c6 Translated using Weblate (German)
Currently translated at 100.0% (904 of 904 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-06-14 08:32:39 +00:00
Justin 7756f83c66 Translated using Weblate (Dutch)
Currently translated at 35.8% (324 of 904 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2017-06-14 08:32:39 +00:00
Luke Barnard 4344af58ee Ask for email address after setting password for the first time
So that the user can reset their password.
2017-06-14 09:31:16 +01:00
Luke Barnard 4f55f810af Ask for email address after setting password for the first time
This is so that the user can reset their password.
2017-06-14 09:30:08 +01:00
AmandineLP 138555759d Translated using Weblate (French)
Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
2017-06-13 23:07:34 +00:00
AmandineLP 6eab420257 Translated using Weblate (French)
Currently translated at 100.0% (904 of 904 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-13 22:19:29 +00:00
Justin 71941f4f92 Translated using Weblate (Dutch)
Currently translated at 35.8% (324 of 904 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2017-06-13 21:53:36 +00:00