Commit graph

5953 commits

Author SHA1 Message Date
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
e469fbc303 Merge branch 'master' into develop 2017-06-20 13:10:42 +01:00
David Baker
529e014739 v0.9.6 2017-06-20 13:08:06 +01:00
David Baker
3f5a6236bb Prepare changelog for v0.9.6 2017-06-20 13:08:05 +01:00
David Baker
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
David Baker
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
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
Richard Lewis
a449588c1c Replace add app dialog with scalar interface 2017-06-20 10:54:41 +01:00
David Baker
0e71918ba1 Merge pull request #1119 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-06-20 10:26:14 +01:00
David Baker
a05ee01f28 Merge pull request #1119 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-06-20 10:05:50 +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
David Baker
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
daniel tygel
17899dd3bf typo 2017-06-20 09:52:16 +01:00
daniel tygel
7b82385084 add two strings to translation 2017-06-20 09:52:09 +01:00
daniel tygel
09b91f4af9 add two strings to translation 2017-06-20 09:52:04 +01: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
David Baker
cb78336cb2 Merge pull request #1122 from matrix-org/dbkr/i18n_droptargets
Internationalise the drop targets
2017-06-19 18:05:49 +01: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
26cb1404c2 Remove unnecessary if 2017-06-19 16:56:27 +01:00
David Baker
a8165d1707 Fix infinite spinner on email registration
Remove setTimeout on dialog display as it's no longer necessary
and causes races.
2017-06-19 16:56:20 +01: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
Richard Lewis
59f6448b3e Merge branch 'kegan/postmessage-widgets' of https://github.com/matrix-org/matrix-react-sdk into rxl881/apps 2017-06-19 16:00:12 +01:00