OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
5,278 Commits
229 Branches
566 Tags
473 MiB
Commit Graph

4313 Commits (36d10e7bb68bfb38aac13d25184f1244e3606d6d)

Author SHA1 Message Date
Michael Telatynski 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
Michael Telatynski 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
Matthew Hodgson 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
Michael Telatynski 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
Richard van der Hoff 1cd152e5f7 Merge pull request #1130 from matrix-org/rav/log_fixes 
Various logging cleanups
 2017-06-20 17:55:07 +01:00
Richard van der Hoff 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
Luke Barnard 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
Michael Telatynski b712a15a14 move in case it is racey ---- somehow? 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-20 16:15:42 +01:00
Luke Barnard 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
Michael Telatynski 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
Michael Telatynski 5460b0f5b2 reset page subtitle on_logged_out 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-20 15:31:12 +01:00
Luke Barnard c337485d90 Redesign the warning to be red text, move below "Sign out" 2017-06-20 15:01:53 +01:00
Luke Barnard 4f9c1fe199 Merge branch 'develop' into luke/feature-user-settings-password-warning 2017-06-20 13:40:34 +01:00
Luke Barnard 5b6daba182 Add en_EN translations 2017-06-20 13:33:18 +01:00
Luke Barnard f15292becf Merge branch 'develop' into luke/fix-email-cancel-button-text 2017-06-20 13:30:34 +01:00
Richard van der Hoff 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
David Baker 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
Luke Barnard 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
IMIN 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
Nathan van Beelen 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
IMIN 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
Szimszon 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
Bamstam 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
Nathan van Beelen 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
Richard van der Hoff a0534e7477 Merge branch 'develop' into rav/handle_received_room_key_requests 2017-06-20 00:25:14 +01:00
Tom Tryfonidis 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
GrigRUSS 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
Krombel 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
David Baker 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
Weblate 640b65eb6c Merge remote-tracking branch 'origin/develop' into develop 2017-06-19 17:14:45 +00:00
David Baker 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
Szimszon 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
Szimszon 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
Brendan Abolivier 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
Brendan Abolivier 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
Weblate 1ba8acc095 Merge remote-tracking branch 'origin/develop' into develop 2017-06-19 16:53:10 +00:00
GrigRUSS 321236568b 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-19 16:53:10 +00:00
IMIN b4e19d533c Translated using Weblate (Korean) 
Currently translated at 73.0% (662 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2017-06-19 16:53:10 +00:00
Szimszon fedbe00f45 Translated using Weblate (Hungarian) 
Currently translated at 60.2% (546 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2017-06-19 16:53:10 +00:00
Bamstam 5151d24731 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-19 16:53:10 +00:00
David Baker b1ca83bb9d Internationalise the drop targets 
Unsure how these had got missed (and yet still had the translation
strings in the json)
 2017-06-19 17:49:22 +01:00
David Baker fb0767eb5d Merge pull request #1121 from coletivoEITA/develop 
add two strings to translation
 2017-06-19 17:25:21 +01:00
daniel tygel 13c12811e7 typo 2017-06-19 13:22:23 -03:00
daniel tygel aebe4fb88f add two strings to translation 2017-06-19 13:21:23 -03:00
daniel tygel c418076c32 add two strings to translation 2017-06-19 13:20:16 -03:00
David Baker 92cb394bac Merge pull request #1120 from matrix-org/dbkr/infinite_spinner_email_reg 
Fix infinite spinner on email registration
 2017-06-19 16:53:01 +01:00
David Baker 640b7a74a2 Remove unnecessary if 2017-06-19 16:45:40 +01:00
David Baker 02da6fdbd5 Fix infinite spinner on email registration 
Remove setTimeout on dialog display as it's no longer necessary
and causes races.
 2017-06-19 16:40:33 +01:00
Weblate 49d6575c91 Merge remote-tracking branch 'origin/develop' into develop 2017-06-19 14:41:19 +00:00
Nathan van Beelen 27652e7e6e Translated using Weblate (Dutch) 
Currently translated at 55.8% (506 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2017-06-19 14:41:19 +00:00