J. Ryan Stinnett
b64ba1dbbf
Add temporary feature flag to control padlocks
...
This default on feature flag will help in case we want to trial padlocks on vs.
off this weekend.
Fixes https://github.com/vector-im/riot-web/issues/12166
2020-01-31 11:09:49 +00:00
Weblate
025adb0a6f
Merge branch 'origin/develop' into Weblate.
2020-01-31 10:46:02 +00:00
J. Ryan Stinnett
19ab395c18
Merge pull request #3995 from matrix-org/jryans/4s-in-mem
...
Add advanced option to keep secret storage in memory for session
2020-01-31 10:45:57 +00:00
Weblate
5ab707bd8b
Merge branch 'origin/develop' into Weblate.
2020-01-31 10:20:18 +00:00
J. Ryan Stinnett
68b2454920
Merge pull request #4006 from matrix-org/jryans/user-list-deco
...
Add shields to member list, move power label to text
2020-01-31 10:20:13 +00:00
Weblate
e9426680be
Merge branch 'origin/develop' into Weblate.
2020-01-31 10:20:10 +00:00
Jeff Huang
fe33e2664f
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 99.2% (2086 of 2102 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-01-31 10:20:09 +00:00
David Baker
24075dc248
Merge pull request #4005 from matrix-org/dbkr/encryption_events
...
Make encryption events into bubble-style tiles
2020-01-31 10:20:03 +00:00
Weblate
2e65ec2c58
Merge branch 'origin/develop' into Weblate.
2020-01-31 09:58:05 +00:00
Jeff Huang
eb02c60abe
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 99.3% (2083 of 2098 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-01-31 09:58:05 +00:00
Zoe
585a38cd45
Merge pull request #4000 from matrix-org/foldleft/12038-copy
...
Update copy when the user verifies their own devices
2020-01-31 09:57:52 +00:00
J. Ryan Stinnett
3ef7e5113b
Move power label to right of name
...
The power label is shown to the right of the name, but hidden on hover.
Part of https://github.com/vector-im/riot-web/issues/11940
2020-01-30 22:09:57 +00:00
David Baker
d56de6a673
i18n again
2020-01-30 20:52:37 +00:00
David Baker
5760e71318
i18n
2020-01-30 20:50:06 +00:00
David Baker
39e9bffe1f
Make encryption events into bubble-style tiles
...
Factors out the verification tile stuff into encryption event
styles so we can reuse them betwen all the encryption event tiles.
Also makes the event list summary stuff even more gnarly by
putting the encryption event tile above the group. We really need
to refactor that. :/
Fixes https://github.com/vector-im/riot-web/issues/12006
2020-01-30 20:03:26 +00:00
Zoe
f787bde80a
copy
2020-01-30 16:36:57 +00:00
Weblate
c5306fd7b6
Merge branch 'origin/develop' into Weblate.
2020-01-30 16:30:24 +00:00
David Baker
8a09cfbfbd
Merge pull request #3999 from matrix-org/dbkr/user_info_black_shields
...
Make shields in UserInfo black if user isn't verified
2020-01-30 16:30:19 +00:00
Weblate
a92b14c7ab
Merge branch 'origin/develop' into Weblate.
2020-01-30 16:13:00 +00:00
Zoe
4a3ea30e52
copy for verification screen
2020-01-30 16:11:05 +00:00
Zoe
9f5f15d1d3
Update copy when the user verifies their own devices
2020-01-30 15:59:59 +00:00
David Baker
0956d00637
Make shields in UserInfo black if user isn't verified
2020-01-30 15:59:03 +00:00
J. Ryan Stinnett
788cb24093
Add advanced option to keep secret storage in memory for session
...
This adds a default-off option to keep the secret storage passphrase cached in
memory for the current session to avoid death by prompts.
2020-01-30 14:18:12 +00:00
J. Ryan Stinnett
fd5798aa87
Change verify user text
2020-01-30 13:21:51 +00:00
random
f2dda28ad3
Translated using Weblate (Italian)
...
Currently translated at 95.5% (2002 of 2096 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-01-30 11:16:24 +00:00
Jeff Huang
7038481394
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 94.8% (1988 of 2096 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-01-30 11:16:22 +00:00
Weblate
b2fe0c5dde
Merge branch 'origin/develop' into Weblate.
2020-01-29 19:54:06 +00:00
catborise
d854afdfd4
Translated using Weblate (Turkish)
...
Currently translated at 70.4% (1475 of 2095 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-01-29 19:54:06 +00:00
J. Ryan Stinnett
3ff3a3cebd
Fix delete button for one session
2020-01-29 19:53:50 +00:00
J. Ryan Stinnett
d8ca9d0f13
Prune unused translations
2020-01-29 16:35:38 +00:00
Weblate
3a770c78c6
Merge branch 'origin/develop' into Weblate.
2020-01-29 16:32:45 +00:00
J. Ryan Stinnett
067bfe2ee3
Tweaks from PR
2020-01-29 16:10:46 +00:00
J. Ryan Stinnett
81ee27f41e
Replace device with session in UI text
...
This replaces "device" with "session" throughout user-visible text at the React
layer. Variable names and comments are left as-is for now.
2020-01-29 15:52:32 +00:00
Weblate
f8df2f4e00
Merge branch 'origin/develop' into Weblate.
2020-01-29 15:33:24 +00:00
J. Ryan Stinnett
725ec1dda6
Merge pull request #3978 from matrix-org/jryans/cs-polish
...
Change new session toast to unverified
2020-01-29 15:33:19 +00:00
Weblate
7bf814810e
Merge branch 'origin/develop' into Weblate.
2020-01-29 15:27:51 +00:00
Michael Telatynski
9457520cc2
Merge pull request #3975 from matrix-org/t3chguy/right_panel_learn_more
...
Replace Verify button in UserInfo verification with "Learn more"
2020-01-29 15:27:46 +00:00
J. Ryan Stinnett
f12fe984e5
Change new session toast to unverified
...
This also changes text to show the device ID and name in the toast.
Fixes https://github.com/vector-im/riot-web/issues/11916
2020-01-29 15:00:04 +00:00
Michael Telatynski
19e7c768b6
Replace Verify button in UserInfo verification with "Learn more"
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 14:11:50 +00:00
Weblate
27fdb573c5
Merge branch 'origin/develop' into Weblate.
2020-01-29 14:09:14 +00:00
random
8418625026
Translated using Weblate (Italian)
...
Currently translated at 98.2% (2060 of 2098 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-01-29 14:04:54 +00:00
Kévin C
042bffc5e2
Translated using Weblate (French)
...
Currently translated at 100.0% (2098 of 2098 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-01-29 14:04:52 +00:00
Michael Telatynski
957e862939
Update copy some more
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 13:58:02 +00:00
Michael Telatynski
227e6f6376
regen i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 12:16:42 +00:00
Weblate
f4a2304c65
Merge branch 'origin/develop' into Weblate.
2020-01-29 09:55:56 +00:00
David Baker
fa1f2cd7e0
Merge pull request #3966 from matrix-org/dbkr/restore_key_backup_in_complete_security
...
Restore key backup in Complete Security dialog
2020-01-29 09:55:50 +00:00
David Baker
e9854f5e44
i18n
2020-01-29 09:32:09 +00:00
Weblate
99a26e9338
Merge branch 'origin/develop' into Weblate.
2020-01-28 23:57:53 +00:00
Michael Telatynski
2c973f7467
Merge pull request #3950 from matrix-org/t3chguy/cs_verification_decoration
...
Cross Signing Right Panel Verification Decoration
2020-01-28 23:57:48 +00:00
David Baker
4a26a72684
Restore key backup in Complete Security dialog
...
Fixes https://github.com/vector-im/riot-web/issues/11889
2020-01-28 22:46:21 +00:00
Weblate
3d816e3042
Merge branch 'origin/develop' into Weblate.
2020-01-28 22:02:25 +00:00
Szimszon
68a22a4d64
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (2075 of 2075 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-01-28 20:36:28 +00:00
David Baker
39c8a9d204
Start new key backup in security setup flow
...
Part of https://github.com/vector-im/riot-web/issues/11889
2020-01-28 19:42:09 +00:00
Weblate
85d929f694
Merge branch 'origin/develop' into Weblate.
2020-01-28 18:05:14 +00:00
David Baker
de295cc350
Merge remote-tracking branch 'origin/develop' into dbkr/better_flow_for_upgrade_on_login
2020-01-28 17:49:57 +00:00
Michael Telatynski
76e61b9948
Merge branches 'develop' and 't3chguy/cs_verification_decoration' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration
2020-01-28 17:19:59 +00:00
David Baker
e1e35a53e4
i18n
2020-01-28 17:18:09 +00:00
Szimszon
6c10c1b76d
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (2078 of 2078 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-01-28 16:54:21 +00:00
David Baker
abfa593791
Make the 'encryption upgrade' flow better
...
Fixes https://github.com/vector-im/riot-web/issues/12086
2020-01-28 16:36:07 +00:00
Weblate
2dbb248598
Merge branch 'origin/develop' into Weblate.
2020-01-28 16:15:54 +00:00
Szimszon
ab8fe80d6b
Translated using Weblate (Hungarian)
...
Currently translated at 98.6% (2048 of 2077 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-01-28 16:15:54 +00:00
Half-Shot
ff532dd684
Merge remote-tracking branch 'origin/develop' into hs/bridge-info-pretty
2020-01-28 16:01:50 +00:00
Weblate
e0ffedca45
Merge branch 'origin/develop' into Weblate.
2020-01-28 11:50:09 +00:00
Half-Shot
7c0a461cbb
Merge remote-tracking branch 'origin/develop' into hs/bridge-info-pretty
2020-01-28 11:22:02 +00:00
Half-Shot
785277d4b8
Review bits for travis
2020-01-28 11:17:51 +00:00
Michael Telatynski
657457c14b
Apply remainder of ux
2020-01-28 11:13:09 +00:00
Half-Shot
bdaf9fd06d
i18n
2020-01-28 10:05:42 +00:00
Kévin C
23a6b44fe7
Translated using Weblate (French)
...
Currently translated at 100.0% (2073 of 2073 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-01-28 10:01:20 +00:00
J. Ryan Stinnett
d014c5239b
Add new session verification details dialog
...
This gives more info on the session you're about to verify, including device
name and ID.
Fixes https://github.com/vector-im/riot-web/issues/11977
2020-01-27 23:16:26 +00:00
catborise
7effd22f6b
Translated using Weblate (Turkish)
...
Currently translated at 73.4% (1521 of 2073 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-01-27 22:39:53 +00:00
Joshua Dietz
68bf646d03
Translated using Weblate (German)
...
Currently translated at 76.5% (1586 of 2073 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-01-27 19:55:33 +00:00
Besnik Bleta
dbf0c5b4c3
Translated using Weblate (Albanian)
...
Currently translated at 99.7% (2066 of 2073 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-01-27 19:55:28 +00:00
Michael Telatynski
ca5d4d88a2
Style the QR code
2020-01-27 17:17:05 +00:00
Damir Jelić
e2dd2bd950
Merge branch 'poljar/seshat-ui-pr' into develop
2020-01-27 17:18:17 +01:00
Weblate
59be4313f4
Merge branch 'origin/develop' into Weblate.
2020-01-27 16:17:38 +00:00
Tirifto
1d90600ee1
Translated using Weblate (Esperanto)
...
Currently translated at 92.3% (1897 of 2055 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2020-01-27 16:17:38 +00:00
Besnik Bleta
40ec6d47a6
Translated using Weblate (Albanian)
...
Currently translated at 99.7% (2048 of 2055 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-01-27 16:17:35 +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
Damir Jelić
e38f1191a5
ManageEventIndex: Clarify that we're currently not downloading any messages.
2020-01-27 15:51:19 +01:00
Half-Shot
5851b10f72
strings
2020-01-27 14:44:11 +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
Damir Jelić
47999c2e46
EventIndexPanel: Add a separate message for the case where Seshat is missing.
2020-01-24 15:26:54 +01: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
Damir Jelić
ffe5d411db
EventIndexPanel: Add a link to the download page of Riot Desktop.
2020-01-24 11:44:56 +01: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
Weblate
cbe8190f15
Merge branch 'origin/develop' into Weblate.
2020-01-23 14:59:26 +00:00
Michael Telatynski
26aa4bb4f3
Merge pull request #3909 from matrix-org/t3chguy/invite_reject_ignore
...
Add Reject & Ignore user button to invites view
2020-01-23 14:59:19 +00:00
Michael Telatynski
662b34c8db
Update MessageComposer placeholder and e2e icon size
2020-01-23 14:38:39 +00:00
Michael Telatynski
74b08ea489
Clean up E2EIcon for better maintainability
2020-01-23 14:38:17 +00:00
Damir Jelić
e2a4a08b25
Update the translation file.
2020-01-23 15:32:43 +01:00
Damir Jelić
64c4ad2eb9
ManageEventIndex: Hook up the disable event index button.
2020-01-23 13:33:55 +01:00
Weblate
7396430c46
Merge branch 'origin/develop' into Weblate.
2020-01-23 11:51:37 +00:00
Michael Telatynski
6c3ac2d0c4
Add Reject & Ignore user button to invites view
2020-01-23 11:50:59 +00:00
David Baker
10db79bb93
Merge remote-tracking branch 'origin/develop' into dbkr/bootstrap_visuals_1
2020-01-23 11:05:21 +00:00
Weblate
f3a846dfff
Merge branch 'origin/develop' into Weblate.
2020-01-23 11:04:58 +00:00
Balázs Meskó
5d8249507c
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (2042 of 2042 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-01-23 11:04:57 +00:00
Kévin C
f7ca8a1b84
Translated using Weblate (French)
...
Currently translated at 100.0% (2042 of 2042 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-01-23 11:04:56 +00:00
Jeff Huang
8218962c37
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (2042 of 2042 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-01-23 11:04:56 +00:00
David Baker
442b8be459
Merge pull request #3897 from matrix-org/dbkr/bootstrap_from_key_backup_ui
...
Implement some parts of new cross signing bootstrap UI
2020-01-23 11:04:49 +00:00
David Baker
c0b7132404
Different copy on done screen if we setup from scratch
2020-01-23 10:18:08 +00:00
Travis Ralston
a196ecc891
Fix i18n
2020-01-22 21:17:40 -07:00
catborise
78ed8019d4
Translated using Weblate (Turkish)
...
Currently translated at 72.6% (1482 of 2042 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-01-22 20:57:27 +00:00
Szimszon
cf5673be17
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (2042 of 2042 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-01-22 20:57:24 +00:00
David Baker
78654cc693
Updated visuals for cross-signing bootstrap
...
* Use Fields rather than plain inputs
* Update padding & alignment to match designs
* Add Skip buttons
* Update copy as per designs
Part of https://github.com/vector-im/riot-web/issues/11902
Based on https://github.com/matrix-org/matrix-react-sdk/pull/3897
2020-01-22 18:08:39 +00:00
Weblate
186def976f
Merge branch 'origin/develop' into Weblate.
2020-01-22 15:26:26 +00:00
David Baker
c04872dd9b
i18n
2020-01-22 15:12:38 +00:00