a7ca8ae4fb
Merge pull request #1132 from matrix-org/dbkr/put_indexeddb_worker_back
...
Make the indexeddb worker script work again
2017-06-21 14:42:01 +01:00
e193fa5be5
Make the indexeddb worker script work again
...
Removed in 939f6d0798
2017-06-21 14:04:43 +01:00
0fffd367c0
Added translation using Weblate (Italian)
2017-06-21 12:55:00 +00:00
a0de81a008
Added translation using Weblate (Belarusian)
2017-06-21 12:54:31 +00:00
71b65078fc
Added translation using Weblate (Norwegian Bokmål)
2017-06-21 12:50:18 +00:00
7aabc7e352
Added translation using Weblate (Polish)
2017-06-21 12:48:48 +00:00
57f97a58af
Added translation using Weblate (Esperanto)
2017-06-21 12:48:18 +00:00
e43eacb1e5
Added translation using Weblate (Turkish)
2017-06-21 12:43:37 +00:00
879ca79c72
Merge pull request #1131 from matrix-org/dbkr/another_first_sync_race
...
Fix another race with first-sync
2017-06-21 11:46:19 +01:00
9ef9d09d44
Fix another race with first-sync
...
Set the first sync variables in onWillStartClient, as they race if
set on logged in (similar fix to https://github.com/matrix-org/matrix-react-sdk/pull/1124 )
2017-06-21 11:27:18 +01:00
7c3742682e
Translated using Weblate (Greek)
...
Currently translated at 100.0% (915 of 915 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/
2017-06-20 20:21:37 +00:00
a5fffe4afa
fix ambiguity
2017-06-20 20:15:25 +01:00
36d10e7bb6
move favicon reset stuff here where its more general
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-20 18:47:35 +01:00
a2a26a9ac9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/reset_favicon_on_logout
2017-06-20 18:43:50 +01:00
d441ba1fd0
Merge pull request #1129 from matrix-org/luke/fix-logout
...
Don't allow UserSettings to render if !MatrixClientPeg.get()
2017-06-20 18:43:33 +01:00
7f6a252bcb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/reset_favicon_on_logout
2017-06-20 18:39:59 +01:00
0c43a46198
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (915 of 915 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-06-20 17:08:42 +00:00
1cd152e5f7
Merge pull request #1130 from matrix-org/rav/log_fixes
...
Various logging cleanups
2017-06-20 17:55:07 +01:00
4aea5908c5
Translated using Weblate (Russian)
...
Currently translated at 100.0% (915 of 915 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-06-20 16:43:49 +00:00
cd73139af5
Various logging cleanups
...
* don't just log errors without any context as to where they came from or what
they mean
* avoid the use of '%s' and multi-argument console.log because it looks awful
under karma.
2017-06-20 17:38:02 +01:00
4fbe688f53
Translated using Weblate (German)
...
Currently translated at 100.0% (915 of 915 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-06-20 16:22:05 +00:00
3320df4cdd
Don't allow UserSettings to render if !MatrixClientPeg.get()
...
Now that it has state that updates following the nulling of the MCP (userHasGeneratedPassword) we need to stop it from rendering if the MCP is null.
Fixes https://github.com/vector-im/riot-web/issues/4319
2017-06-20 17:13:06 +01:00
b712a15a14
move in case it is racey ---- somehow?
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-20 16:15:42 +01:00
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
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
David Baker