OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
5,764 Commits
219 Branches
563 Tags
450 MiB
Commit Graph

5764 Commits (199b7710519ec37571dbc5eed07a495e92288313)

Author SHA1 Message Date
Robert Swain 9c8ab2691b AppsDrawer: Only append queryParams once 2017-06-14 13:26:43 +02:00
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
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 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 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
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 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
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
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
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
David Baker 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
Luke Barnard 31b3b4687a Trailing comma 2017-06-13 18:34:33 +01:00
Luke Barnard aa0ef51932 i18n for setting password flow 2017-06-13 18:28:43 +01:00
Matthew Hodgson 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
Michael Telatynski 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
David Baker 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
Robert Swain d67e7289e8 Merge branch 'develop' into rob/apps 2017-06-13 15:50:43 +02:00
Robert Swain 03ba3bd431 Merge branch 'rxl881/apps' into rob/apps 2017-06-13 15:41:52 +02:00
Robert Swain 91eabbba60 MessageComposer: Trigger Jitsi app from call buttons 2017-06-13 15:35:13 +02:00
Robert Swain 5d898dd098 AuxPanel: Add type checking for userId and showApps properties 2017-06-13 15:34:05 +02:00
Robert Swain b63edcb390 AppTile: Support deletion of apps from room state 2017-06-13 15:33:17 +02:00
Robert Swain bcb2f8408b AppTile: Fix typo in property name 2017-06-13 15:32:40 +02:00
Robert Swain 2aa0aa61e3 AddAppDialog: Support adding apps to room state 2017-06-13 15:31:37 +02:00
Robert Swain a72cb794f2 AppsDrawer: Populate apps from room state 2017-06-13 15:28:37 +02:00
Robert Swain e2759774fc RoomView: Correctly pass userId from matrix client 
It isn't set in the state anywhere.
 2017-06-13 15:19:38 +02:00
Robert Swain 99b1de7f0e RoomView: Display AppsDrawer if apps in room state 2017-06-13 15:19:06 +02:00
Michael Telatynski 918efe5912 width and height must be int otherwise synapse cries 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-13 13:23:25 +01:00
David Baker bd00c1d4b1 Merge pull request #1083 from matrix-org/t3chguy/width_height_int 
width and height must be int otherwise synapse cries
 2017-06-13 13:23:12 +01:00
Richard van der Hoff 392cd7861d Merge pull request #1084 from matrix-org/rav/remove_roomstore_listener 
remove RoomViewStore listener from MatrixChat on unmount
 2017-06-13 13:10:49 +01:00