mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-26 12:45:53 +03:00
Code Issues Projects Releases Packages Wiki Activity
5088 commits 208 branches 547 tags 609 MiB
Commit graph

5088 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luke Barnard
9e3efb54d3 Merge pull request #1096 from matrix-org/dbkr/fix_warm_fuzzy_text_mk_2 
Show correct text in set email password dialog (2)
 2017-06-14 16:59:12 +01:00
Richard van der Hoff
e9aac09105 Merge pull request #1092 from matrix-org/rav/no_resume_client_on_login 
Don't create a guest login if user went to /login
 2017-06-14 16:58:12 +01:00
David Baker
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
David Baker
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
David Baker
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
Luke Barnard
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
David Baker
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
David Baker
302233db90 Merge pull request #1093 from matrix-org/luke/undefined-room-alias-if-not-specified-view-room 
When not specified, remove roomAlias state in RoomViewStore
 2017-06-14 14:17:06 +01:00
Luke Barnard
f25c081007 When not specified, remove roomAlias state in RoomViewStore 2017-06-14 12:05:25 +01:00
David Baker
74a74bc75d Merge branch 'master' into develop 2017-06-14 11:18:56 +01: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
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
David Baker
431b482d18 Don't put in spurious newline 2017-06-13 13:03:20 +01:00
David Baker
aab87233c3 Add script to copy translations between files 
So we can fill in missing translations from different dialects

Use it to fill in missing strings in pt from pt_BR
 2017-06-13 13:03:13 +01:00
David Baker
24f1bd1460 Merge new translations 
Merge remote-tracking branch 'weblate/develop' into develop
 2017-06-13 13:02:25 +01:00
Luke Barnard
33f5d81d18 Only process user_directory response if it's for the current query 2017-06-13 13:01:33 +01:00
Luke Barnard
35620311b3 Fix regressions with starting a 1-1. 2017-06-13 13:01:21 +01:00
Richard van der Hoff
68e1a7be74 Clear persistent storage on login and logout 
Make sure that we don't end up with sensitive data sitting around in the stores
from a previous session.
 2017-06-13 12:51:47 +01:00
David Baker
2e07a0fa12 Merge pull request #1082 from matrix-org/dbkr/copy_translations 
Add script to copy translations between files
 2017-06-13 12:49:47 +01:00