f7a22cccb6
Merge pull request #1128 from matrix-org/luke/fix-invite-user-id-case
...
Fix ability to invite users with caps in their user IDs
2017-06-20 16:03:49 +01:00
2c2091438e
Fix ability to invite users with caps in their user IDs
...
By lowercasing only when testing against local user IDs/display names. The user_directory shouldn't care. And when we make the placeholder "We didn't get any results, but here's the user with the exact mxid you typed in", use the original query.
2017-06-20 15:46:54 +01:00
04aed416d2
Merge branches 'develop' and 't3chguy/reset_favicon_on_logout' of github.com:matrix-org/matrix-react-sdk into t3chguy/reset_favicon_on_logout
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
# src/components/structures/MatrixChat.js
2017-06-20 15:37:05 +01:00
5460b0f5b2
reset page subtitle on_logged_out
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-20 15:31:12 +01:00
029a882928
Merge remote-tracking branch 'origin/develop' into develop
2017-06-20 14:25:31 +00:00
1b8e5f8a05
Translated using Weblate (Hungarian)
...
Currently translated at 77.7% (705 of 907 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-06-20 14:25:31 +00:00
5efee2d1bf
Translated using Weblate (French)
...
Currently translated at 100.0% (907 of 907 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-20 14:25:31 +00:00
8a0000675a
Translated using Weblate (Dutch)
...
Currently translated at 60.5% (549 of 907 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2017-06-20 14:25:30 +00:00
a547e9c200
Merge pull request #1126 from matrix-org/luke/redesign-user-settings-pwd-warn
...
Redesign the warning to be red text, move below "Sign out"
2017-06-20 15:23:47 +01:00
c337485d90
Redesign the warning to be red text, move below "Sign out"
2017-06-20 15:01:53 +01:00
6de48d628f
Merge pull request #1123 from matrix-org/luke/feature-user-settings-password-warning
...
Implement password nag warning in user settings account section
2017-06-20 14:02:20 +01:00
a2dc17256a
Merge remote-tracking branch 'origin/develop' into t3chguy/updating_stuff
2017-06-20 13:44:27 +01:00
4f9c1fe199
Merge branch 'develop' into luke/feature-user-settings-password-warning
2017-06-20 13:40:34 +01:00
c0e12798b6
Merge pull request #1118 from matrix-org/luke/fix-email-cancel-button-text
...
Show a "Skip" button instead of "Cancel" in SetEmailDialog
2017-06-20 13:36:51 +01:00
5b6daba182
Add en_EN translations
2017-06-20 13:33:18 +01:00
f15292becf
Merge branch 'develop' into luke/fix-email-cancel-button-text
2017-06-20 13:30:34 +01:00
0c431887b0
Merge pull request #996 from matrix-org/rav/handle_received_room_key_requests
...
Pop up a dialog when we get a room key request
2017-06-20 13:20:58 +01:00
e469fbc303
Merge branch 'master' into develop
2017-06-20 13:10:42 +01:00
529e014739
v0.9.6
2017-06-20 13:08:06 +01:00
3f5a6236bb
Prepare changelog for v0.9.6
2017-06-20 13:08:05 +01:00
61c5384855
Fix another infinite spin on register
...
Don't set ready on logging_in, set it before we start the client,
as commented
2017-06-20 12:53:44 +01:00
a7775b283b
Merge pull request #1124 from matrix-org/dbkr/fix_register_infinite_spin
...
Fix another infinite spin on register
2017-06-20 12:52:02 +01:00
e15aedfeb2
Fix another infinite spin on register
...
Don't set ready on logging_in, set it before we start the client,
as commented
2017-06-20 12:03:37 +01:00
e16d1b3cfb
Implement password nag warning in user settings account section
...
"To return to your account in future you need to set a password" in the account section when a user has not yet set a password (is a PWLU).
2017-06-20 11:22:07 +01:00
a449588c1c
Replace add app dialog with scalar interface
2017-06-20 10:54:41 +01:00
0e71918ba1
Merge pull request #1119 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2017-06-20 10:26:14 +01:00
a05ee01f28
Merge pull request #1119 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2017-06-20 10:05:50 +01:00
dcc9443918
Translated using Weblate (Korean)
...
Currently translated at 73.9% (671 of 907 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2017-06-20 09:00:03 +00:00
97e28a12c2
Translated using Weblate (Dutch)
...
Currently translated at 57.4% (521 of 907 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2017-06-20 09:00:03 +00:00
42b26bd4e4
Translated using Weblate (Korean)
...
Currently translated at 73.6% (668 of 907 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2017-06-20 08:54:29 +00:00
59f6ab8c66
Translated using Weblate (Hungarian)
...
Currently translated at 74.8% (679 of 907 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-06-20 08:54:29 +00:00
499d3b9438
Translated using Weblate (German)
...
Currently translated at 100.0% (907 of 907 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-06-20 08:54:29 +00:00
fdae1b4fef
Translated using Weblate (Dutch)
...
Currently translated at 56.3% (511 of 907 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2017-06-20 08:54:29 +00:00
692b03f2e7
Internationalise the drop targets
...
Unsure how these had got missed (and yet still had the translation
strings in the json)
2017-06-20 09:53:51 +01:00
17899dd3bf
typo
2017-06-20 09:52:16 +01:00
7b82385084
add two strings to translation
2017-06-20 09:52:09 +01:00
09b91f4af9
add two strings to translation
2017-06-20 09:52:04 +01:00
a0534e7477
Merge branch 'develop' into rav/handle_received_room_key_requests
2017-06-20 00:25:14 +01:00
65474bfd4c
Translated using Weblate (Greek)
...
Currently translated at 100.0% (907 of 907 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/
2017-06-19 21:43:14 +00:00
c5bc4d4542
Translated using Weblate (Russian)
...
Currently translated at 100.0% (907 of 907 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-06-19 17:37:14 +00:00
d29bc8546d
Translated using Weblate (German)
...
Currently translated at 100.0% (907 of 907 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-06-19 17:20:33 +00:00
ec4d1de42f
Translated using Weblate (Russian)
...
Currently translated at 99.7% (905 of 907 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-06-19 17:17:01 +00:00
640b65eb6c
Merge remote-tracking branch 'origin/develop' into develop
2017-06-19 17:14:45 +00:00
d5a7ef525f
Translated using Weblate (Russian)
...
Currently translated at 99.7% (905 of 907 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-06-19 17:14:41 +00:00
f437784807
Translated using Weblate (Hungarian)
...
Currently translated at 62.0% (563 of 907 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-06-19 17:14:41 +00:00
cb78336cb2
Merge pull request #1122 from matrix-org/dbkr/i18n_droptargets
...
Internationalise the drop targets
2017-06-19 18:05:49 +01:00
5e44c72952
Translated using Weblate (Hungarian)
...
Currently translated at 61.5% (558 of 907 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-06-19 17:04:10 +00:00
6bb22b618b
Translated using Weblate (French)
...
Currently translated at 100.0% (907 of 907 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-19 17:04:10 +00:00
09de50a80a
Translated using Weblate (French)
...
Currently translated at 100.0% (907 of 907 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-19 16:59:53 +00:00
1ba8acc095
Merge remote-tracking branch 'origin/develop' into develop
2017-06-19 16:53:10 +00:00
Luke Barnard