Commit graph

4894 commits

Author SHA1 Message Date
Michael Telatynski
657457c14b Apply remainder of ux 2020-01-28 11:13:09 +00:00
Michael Telatynski
ca5d4d88a2 Style the QR code 2020-01-27 17:17:05 +00:00
Michael Telatynski
ddb0f06005 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration
 Conflicts:
	src/components/views/right_panel/VerificationPanel.js
2020-01-27 15:46:38 +00:00
David Baker
d5ac37a4ab
Merge pull request #3940 from matrix-org/dbkr/e2e_upgrade_toast
Verification nag toasts
2020-01-27 10:16:18 +00:00
David Baker
8c4c79adde i18n 2020-01-27 10:05:42 +00:00
catborise
ca774f45fe Translated using Weblate (Turkish)
Currently translated at 73.8% (1513 of 2050 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-01-27 09:42:52 +00:00
Tirifto
13ba90a054 Translated using Weblate (Esperanto)
Currently translated at 90.1% (1848 of 2050 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2020-01-27 09:42:52 +00:00
Besnik Bleta
49cdbc9ebe Translated using Weblate (Albanian)
Currently translated at 99.7% (2043 of 2050 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-01-26 17:23:20 +00:00
David Baker
8c5fd5c77e Verification nag toasts
Implement the three differenty cases for this session, and also fix
ones for other sessions which had the wrong copy.

Fixes https://github.com/vector-im/riot-web/issues/11220
2020-01-25 16:52:12 +00:00
Kévin C
c96f82cd8b Translated using Weblate (French)
Currently translated at 100.0% (2050 of 2050 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-01-25 12:40:31 +00:00
Jeff Huang
e710607a72 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2050 of 2050 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-01-25 12:40:29 +00:00
Osoitz
440b3fd1fd Translated using Weblate (Basque)
Currently translated at 100.0% (2050 of 2050 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2020-01-25 12:40:27 +00:00
Weblate
6895ad1009 Merge branch 'origin/develop' into Weblate. 2020-01-24 22:39:14 +00:00
catborise
662c723bf3 Translated using Weblate (Turkish)
Currently translated at 73.7% (1515 of 2056 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-01-24 22:36:49 +00:00
Szimszon
95df8b9bb7 Translated using Weblate (Hungarian)
Currently translated at 99.8% (2052 of 2056 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-01-24 22:36:47 +00:00
J. Ryan Stinnett
bf0e1efce8 Hide default encryption algorithm
When the default encryption algorithm is used, we hide it to remove some jargon
from the app. For any other algorithm, we continue showing it and add
"unrecognised".

Fixes https://github.com/vector-im/riot-web/issues/8829
2020-01-24 17:53:33 +00:00
Michael Telatynski
342fcb09c4 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration
 Conflicts:
	src/components/views/right_panel/VerificationPanel.js
	src/components/views/toasts/VerificationRequestToast.js
2020-01-24 16:19:41 +00:00
Michael Telatynski
7a5e172b88 Apply a huge part of the decorations and copy 2020-01-24 16:16:46 +00:00
Weblate
72f24b127d Merge branch 'origin/develop' into Weblate. 2020-01-24 15:57:33 +00:00
Travis Ralston
9722b34c35
Merge pull request #3906 from matrix-org/travis/user-lists-labs
Remove user lists feature flag, making it the default
2020-01-24 08:57:27 -07:00
Weblate
5ccf5573da Merge branch 'origin/develop' into Weblate. 2020-01-24 15:57:24 +00:00
Travis Ralston
abc2808b62 Fix i18n post-merge 2020-01-24 08:57:03 -07:00
Travis Ralston
5f2df15987
Merge branch 'develop' into travis/invite-polish 2020-01-24 08:56:18 -07:00
Weblate
5ed599f6d7 Merge branch 'origin/develop' into Weblate. 2020-01-24 13:54:56 +00:00
Zoe
543be90eda
Merge pull request #3931 from matrix-org/foldleft/12035-room-decoration-design-pass
Design pass for room icons
2020-01-24 13:54:51 +00:00
random
a46646105f Translated using Weblate (Italian)
Currently translated at 100.0% (2057 of 2057 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-01-24 13:44:01 +00:00
Zoe
75da5b7944 Design pass for room icons 2020-01-24 13:37:47 +00:00
Weblate
6a1ab4fe17 Merge branch 'origin/develop' into Weblate. 2020-01-24 13:31:14 +00:00
random
be98f24051 Translated using Weblate (Italian)
Currently translated at 98.8% (2032 of 2057 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-01-24 13:31:14 +00:00
David Baker
7de5f09f9f
Merge pull request #3928 from matrix-org/dbkr/split_out_asyncwrapper
Split AsyncWrapper out from Modal
2020-01-24 13:31:09 +00:00
random
6ebeb0a376 Translated using Weblate (Italian)
Currently translated at 98.7% (2031 of 2057 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-01-24 13:30:31 +00:00
Weblate
da2b29b6e5 Merge branch 'origin/develop' into Weblate. 2020-01-24 13:27:04 +00:00
Zoe
131aacd3ab
Merge pull request #3929 from matrix-org/zip/11840-tooltips-on-padlocks
Seperates out the padlock icon, and adds a tooltip
2020-01-24 13:26:59 +00:00
Weblate
27ffa88ff8 Merge branch 'origin/develop' into Weblate. 2020-01-24 13:18:15 +00:00
Michael Telatynski
2c40b73ff6
Merge pull request #3910 from matrix-org/t3chguy/cross-signing-composer
Cross Signing redesign for composer
2020-01-24 13:18:09 +00:00
David Baker
c5ecd83bc1 remove .orig file 2020-01-24 12:34:50 +00:00
David Baker
dbf1c9a02a Apparently i18n... 2020-01-24 12:34:03 +00:00
Zoe
a6fcbcacf6 Seperates out the padlock icon, and adds a tooltip
Fixes https://github.com/vector-im/riot-web/issues/11840
2020-01-24 12:06:21 +00:00
Michael Telatynski
210616c737 Phase 1, split out UserInfo into a generic Pane, use for EncInfo 2020-01-24 11:45:39 +00:00
Kévin C
169852adec Translated using Weblate (French)
Currently translated at 100.0% (2053 of 2053 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-01-24 09:38:32 +00:00
Travis Ralston
b5f22001b1 Fix copy 2020-01-23 17:22:39 -07:00
Weblate
12b8bd7344 Merge branch 'origin/develop' into Weblate. 2020-01-23 23:43:08 +00:00
Travis Ralston
c22bfa84b7 Hide password section if you can't change your password
Fixes https://github.com/vector-im/riot-web/issues/11950
2020-01-23 16:29:55 -07:00
Weblate
d807a1b21e Merge branch 'origin/develop' into Weblate. 2020-01-23 22:09:15 +00:00
Travis Ralston
18f8f8858c Don't list every single alias when there's many 2020-01-23 15:00:18 -07:00
Weblate
adb3066567 Merge branch 'origin/develop' into Weblate. 2020-01-23 22:00:13 +00:00
Travis Ralston
1ac82a9f16 Revert "Don't list every single alias when there's many"
This reverts commit 6fc647c3d9.
2020-01-23 15:00:02 -07:00
Weblate
813947fbde Merge branch 'origin/develop' into Weblate. 2020-01-23 22:00:02 +00:00
Travis Ralston
6fc647c3d9 Don't list every single alias when there's many 2020-01-23 14:59:52 -07:00
catborise
4cff50a11e Translated using Weblate (Turkish)
Currently translated at 72.9% (1494 of 2050 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-01-23 21:49:34 +00:00