Commit Graph

62531 Commits

Author SHA1 Message Date
David Baker 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
David Baker a2dc17256a Merge remote-tracking branch 'origin/develop' into t3chguy/updating_stuff 2017-06-20 13:44:27 +01:00
Luke Barnard 4f9c1fe199 Merge branch 'develop' into luke/feature-user-settings-password-warning 2017-06-20 13:40:34 +01:00
David Baker 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
Luke Barnard 047b255e14 Add en_EN translations 2017-06-20 13:33:38 +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 3926e4dd98 Merge branch 'master' into develop 2017-06-20 13:18:58 +01:00
David Baker 639b17c663 v0.11.3 v0.11.3 2017-06-20 13:15:36 +01:00
David Baker ea8a49f1b7 Prepare changelog for v0.11.3 2017-06-20 13:15:35 +01:00
David Baker eda3f20b26 v0.11.3 2017-06-20 13:13:28 +01:00
David Baker 6ef32f182a react-sdk 0.9.6 2017-06-20 13:13:03 +01:00
David Baker 6bae293bdf Merge pull request #4361 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
2017-06-20 13:12:14 +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 d5d29c1c92 Give _t to PasswordNagBar, add CSS for UserSettings password warning
Codep https://github.com/matrix-org/matrix-react-sdk/pull/1123
2017-06-20 11:23:34 +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 556ff24c5f Merge pull request #4361 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
2017-06-20 10:19:34 +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
strixaluco f5d9af9b0b Translated using Weblate (Ukrainian)
Currently translated at 98.0% (196 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/uk/
2017-06-20 09:00:47 +00:00
GrigRUSS 3ff0ed52b2 Translated using Weblate (Russian)
Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
2017-06-20 09:00:47 +00: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
turt2live 4ae6e9fdfd Remove 'Redact' from en_US and en_EN as it is no longer needed
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-06-19 16:31:59 -06:00
turt2live b9fc46fa41 Change missed 'Redact' to 'Remove' in ImageView.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-06-19 16:24:03 -06: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
GrigRUSS 133f3d24f5 Translated using Weblate (Russian)
Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
2017-06-19 17:18:38 +00:00
Bamstam 241ebe50d2 Translated using Weblate (German)
Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2017-06-19 17:18:38 +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