1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-06-24 16:41:47 +03:00
Commit Graph

35014 Commits

Author SHA1 Message Date
ed5f01d46f Add logging for diagnosis 2017-06-14 16:53:21 +01:00
b5fd78a97f Only attempt to peek once in the lifetime of RoomView 2017-06-14 16:50:46 +01:00
2d6ba056d1 Attempt to follow closely what RoomView did pre-ILAG
In terms of peeking and what happens to the state when joining. This is another attempt to mitigate https://github.com/vector-im/riot-web/issues/4307
2017-06-14 16:48:34 +01:00
9ecf82a1f2 Show correct text in set email password dialog (2)
Fixes https://github.com/vector-im/riot-web/issues/4311

The cancel button onClick was hooked directly up to onFinished, so
the mouse event ended up as the boolean for whether an email had
been set.
2017-06-14 16:06:28 +01:00
449c65b784 Merge pull request #1095 from matrix-org/luke/fix-guest-password-success-and-email-set
Give password confirmation correct title, description
2017-06-14 15:16:36 +01:00
602255f92c Merge pull request #1094 from matrix-org/dbkr/enter_submits_changepassword
Make enter submit change password form
2017-06-14 15:16:11 +01:00
1d4a3ae5a3 Give password confirmation correct title, description
Fixes https://github.com/vector-im/riot-web/issues/4311

This was due to `BaseDialog` calling `onFinished` with a mouse event instead of `false` (and it was assumed to call with `true/false`, but doesn't)
2017-06-14 14:58:39 +01:00
57ef6f3cf8 Make enter submit change password form
Fixes https://github.com/vector-im/riot-web/issues/4302
2017-06-14 14:50:48 +01:00
edb11d805e AppsDrawer: Open add app widget if opening empty drawer
This felt much better than having to also click the add app widget
button.
2017-06-14 15:05:29 +02:00
5f020423bc AddAppDialog: Put the submit button inside the form 2017-06-14 15:05:11 +02:00
2d3c886646 AppsDrawer: Generate room alias for vrdemo 2017-06-14 13:27:15 +02:00
9c8ab2691b AppsDrawer: Only append queryParams once 2017-06-14 13:26:43 +02:00
880e7149f3 ModularWidgets: Add a quick VR demo widget 2017-06-14 13:05:43 +02:00
f25c081007 When not specified, remove roomAlias state in RoomViewStore 2017-06-14 12:05:25 +01:00
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
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
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
5d649626b0 Merge remote-tracking branch 'origin/develop' into rav/no_resume_client_on_login 2017-06-14 11:08:16 +01:00
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
2a51aec193 Merge pull request #1091 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-06-14 10:55:24 +01:00
57dfbc4701 Remove unused imports 2017-06-14 10:53:02 +01:00
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
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
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
755005b1c6 Merge remote-tracking branch 'origin/develop' into develop 2017-06-14 09:30:04 +00:00
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
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
7ba2d19249 Merge remote-tracking branch 'origin/develop' into develop 2017-06-14 08:32:39 +00:00
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
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
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
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
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
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
acd7cf4439 Merge pull request #1089 from matrix-org/luke/set-email-after-password
i18n for setting password flow
2017-06-13 18:38:39 +01:00
31b3b4687a Trailing comma 2017-06-13 18:34:33 +01:00
aa0ef51932 i18n for setting password flow 2017-06-13 18:28:43 +01:00
9dad5d0132 Merge pull request #1088 from matrix-org/t3chguy/fix_purple_e2e_room_settings
remove mx_filterFlipColor from verified e2e icon so its not purple :/
2017-06-13 17:45:56 +01:00
f4aadafed9 remove mx_filterFlipColor from verified e2e icon so its not purple :/
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-13 17:42:30 +01:00
5fd45233fb 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-13 17:35:09 +01:00
d67e7289e8 Merge branch 'develop' into rob/apps 2017-06-13 15:50:43 +02:00
03ba3bd431 Merge branch 'rxl881/apps' into rob/apps 2017-06-13 15:41:52 +02:00
91eabbba60 MessageComposer: Trigger Jitsi app from call buttons 2017-06-13 15:35:13 +02:00
5d898dd098 AuxPanel: Add type checking for userId and showApps properties 2017-06-13 15:34:05 +02:00
b63edcb390 AppTile: Support deletion of apps from room state 2017-06-13 15:33:17 +02:00
bcb2f8408b AppTile: Fix typo in property name 2017-06-13 15:32:40 +02:00
2aa0aa61e3 AddAppDialog: Support adding apps to room state 2017-06-13 15:31:37 +02:00
a72cb794f2 AppsDrawer: Populate apps from room state 2017-06-13 15:28:37 +02:00
e2759774fc RoomView: Correctly pass userId from matrix client
It isn't set in the state anywhere.
2017-06-13 15:19:38 +02:00
99b1de7f0e RoomView: Display AppsDrawer if apps in room state 2017-06-13 15:19:06 +02:00