Commit Graph

18484 Commits (aea8c3248ced0abc17eb8f9d47da84330e3c722f)

Author SHA1 Message Date
Travis Ralston b35356833f Merge branch 'develop' into travis/sso-uia 2020-03-30 14:56:52 -06:00
J. Ryan Stinnett 690b5945d0 Pass new secret storage key to bootstrap path
This passes the newly created secret storage key down to the bootstrap path for
temporary caching to avoid prompting the user for it again in the later stages
of bootstrapping.

Fixes https://github.com/vector-im/riot-web/issues/12867
2020-03-30 21:40:11 +01:00
waylon531 9cf82d8743
Updated strings
I added a new string for the /html command and had to regerate strings
for i18

Signed-off-by: Waylon Cude <waylon.cude@finzdani.net>
2020-03-30 11:44:34 -07:00
waylon531 dd4331cd18
Added the /html command
This command lets you send html messages through riot. This is
incredibly useful for doing advanced formatting not supported by
markdown and lets riot support even more html tags.

Signed-off-by: Waylon Cude <waylon.cude@finzdani.net>
2020-03-30 11:44:08 -07:00
Weblate f8051f9f6f Merge branch 'origin/develop' into Weblate. 2020-03-30 18:13:22 +00:00
Damir Jelić 930f93b974 Merge branch 'poljar/event-index-log-skipped-events' into develop 2020-03-30 20:12:51 +02:00
Weblate 1e2b175612 Merge branch 'origin/develop' into Weblate. 2020-03-30 18:08:35 +00:00
Michael Telatynski 6517ed07bd
Merge pull request #4307 from matrix-org/t3chguy/fixes1111
Field: mark id as optional in propTypes
2020-03-30 19:08:29 +01:00
Michael Telatynski 147e7bc57e Field: mark id as optional in propTypes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-30 18:42:47 +01:00
Weblate b5587ea853 Merge branch 'origin/develop' into Weblate. 2020-03-30 17:08:55 +00:00
Travis Ralston ca5d540311 Remove underscore from Jitsi conference names
Fixes https://github.com/vector-im/riot-web/issues/12929

Note: we don't need this to fix conferences in our hosted instance (riot.im or modular.im), but it is a common thing for self-hosters, including sometimes ourselves, to accidentally make mistakes on.
2020-03-30 10:40:26 -06:00
J. Ryan Stinnett a3555cacea Merge remote-tracking branch 'origin/develop' into jryans/id-change-red 2020-03-30 14:52:22 +01:00
Weblate 28356345fc Merge branch 'origin/develop' into Weblate. 2020-03-30 13:23:19 +00:00
Zoe 4e8cec354d
Merge pull request #4290 from matrix-org/foldleft/12484-user-shields
Refactor shield display logic; changed rules for DMs
2020-03-30 14:23:13 +01:00
Michael Telatynski 559b8e174b undo accidental changes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-30 14:13:08 +01:00
Michael Telatynski c6d69f3d3f de-tslint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-30 14:09:10 +01:00
Michael Telatynski 8c2b910c03 rework SlashCommands to better expose aliases
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-30 13:59:08 +01:00
Damir Jelić 836b348bff EventIndex: Add a trailing comma. 2020-03-30 14:49:28 +02:00
Damir Jelić 4371006c58 EventIndex: Better logging on how many events are added.
This adds a bit more info to how many events are added, how many skipped
and if they are skipped because they are undecryptable.
2020-03-30 14:49:28 +02:00
random b5c45b7d12 Translated using Weblate (Italian)
Currently translated at 100.0% (2242 of 2242 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-03-30 10:56:25 +00:00
Weblate 68ebba1f94 Merge branch 'origin/develop' into Weblate. 2020-03-30 09:30:43 +00:00
Michael Telatynski 90b8d87a39
Merge pull request #4297 from matrix-org/t3chguy/kbd11
Keyboard shortcuts: Escape cancel reply and fix Ctrl+K
2020-03-30 10:30:38 +01:00
Weblate 4b480f0b6d Merge branch 'origin/develop' into Weblate. 2020-03-30 09:30:24 +00:00
Michael Telatynski 057ca35c24
Merge pull request #4298 from matrix-org/t3chguy/Bugreportdialog
Field: make id optional, generate one if not provided
2020-03-30 10:30:19 +01:00
Weblate 2035a038aa Merge branch 'origin/develop' into Weblate. 2020-03-30 09:30:02 +00:00
Michael Telatynski 5375f888ea
Merge pull request #4293 from matrix-org/t3chguy/fix_scrollbars
Fix ugly scrollbars in TabbedView (settings), emojipicker and widgets
2020-03-30 10:29:56 +01:00
Weblate 8ef77fec8a Merge branch 'origin/develop' into Weblate. 2020-03-30 09:22:31 +00:00
Zoe 403d70897d
Merge pull request #4274 from matrix-org/foldleft/reset-refactor
rename secret storage force-reset variable to avoid confusion
2020-03-30 10:22:24 +01:00
Zoe 098df07c67 review feedback 2020-03-30 10:18:47 +01:00
Michael Telatynski 55c2d98571 Fix Field ctor
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-29 23:16:57 +01:00
Michael Telatynski 19aae087e0 Field: make id optional, generate one if not provided
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-29 22:59:15 +01:00
Michael Telatynski 167f953ac7 Document Composer:Escape to cancel a reply
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-29 20:35:35 +01:00
Michael Telatynski acc41585ab Fix CmdOrCtrl+K for collapsed LHS
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-29 20:33:27 +01:00
Michael Telatynski 2a54a8aa85 Escape should cancel a reply
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-29 20:33:01 +01:00
Michael Telatynski 2ff16844e5 Make ELS somewhat more accessible
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-29 20:12:10 +01:00
Michael Telatynski b2d905ef2c Make FormatButton use AccessibleButtons
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-29 20:07:32 +01:00
Szimszon 78e46f0476 Translated using Weblate (Hungarian)
Currently translated at 100.0% (2241 of 2241 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-03-29 14:27:22 +00:00
Tirifto b7d33a4c9b Translated using Weblate (Esperanto)
Currently translated at 100.0% (2241 of 2241 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2020-03-29 14:27:22 +00:00
Jeff Huang 164854b4f8 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2241 of 2241 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-03-29 14:27:21 +00:00
Michael Telatynski f586aaab35 Fix ugly scrollbars in TabbedView (settings), emojipicker and widgets
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-28 00:51:01 +00:00
J. Ryan Stinnett 37619dd127 Show red shield for users that become unverified
For any users that we previously verified but that are not unverified, we will
now mark them and rooms they are in with a red shield.

Fixes https://github.com/vector-im/riot-web/issues/12808
2020-03-28 00:21:18 +00:00
Travis Ralston 1e30bdb739 Early proof of concept for SSO UIA
It works well enough to start doing design.
2020-03-27 14:39:59 -06:00
Travis Ralston 984f9ea4aa Fix fallback auth link to act and look like a link 2020-03-27 13:44:32 -06:00
Weblate 5f9358796d Merge branch 'origin/develop' into Weblate. 2020-03-27 16:15:01 +00:00
Tuomas Hietala 39889a6e2b Translated using Weblate (Finnish)
Currently translated at 92.0% (2062 of 2241 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2020-03-27 16:15:01 +00:00
Osoitz 71f8a49e60 Translated using Weblate (Basque)
Currently translated at 100.0% (2241 of 2241 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2020-03-27 16:14:57 +00:00
Besnik Bleta f90dfa2421 Translated using Weblate (Albanian)
Currently translated at 99.7% (2234 of 2241 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-03-27 16:14:57 +00:00
Bruno Windels 29bb7e38fe fix undismissable toasts 2020-03-27 16:45:46 +01:00
Michael Telatynski 9d0ed6e800 fix copy-pasta error
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 14:19:43 +00:00
Michael Telatynski de0895b881 i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 14:06:21 +00:00
Michael Telatynski 6664535a26 change welcome page placeholders
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 14:05:32 +00:00
Michael Telatynski f4d3cc8ee6 revert stale changes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 14:05:14 +00:00
Michael Telatynski db6f88c66a Welcome page, support $ssoUrl and $casUrl placeholders
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 14:02:32 +00:00
Zoe 1f0d7923d7 with output type 2020-03-27 13:51:30 +00:00
Zoe 5b7e7f49d1 lint 2020-03-27 13:50:03 +00:00
Zoe 5d7adef0a2 Factor out shield display rules into one file 2020-03-27 13:45:35 +00:00
Zoe 0f2e2ea069 Update shield display rules 2020-03-27 13:44:54 +00:00
Michael Telatynski 548e918437 only auto-sso when disable_custom_urls is true
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 12:01:10 +00:00
Zoe a02731f632 Merge branch 'develop' into foldleft/reset-refactor 2020-03-27 10:50:05 +00:00
Weblate 5c2c8ac3b0 Merge branch 'origin/develop' into Weblate. 2020-03-27 10:21:58 +00:00
Michael Telatynski cf4f595f79
Merge pull request #4289 from matrix-org/t3chguy/userInfo_avatar
blank out UserInfo avatar when changing between members
2020-03-27 10:21:53 +00:00
Weblate b8ebf21713 Merge branch 'origin/develop' into Weblate. 2020-03-27 10:20:07 +00:00
Bruno Windels 2278a724aa
Merge pull request #4283 from matrix-org/bwindels/cancelverifypanel
Add cancel button to verification panel
2020-03-27 10:20:02 +00:00
Weblate 813d214773 Merge branch 'origin/develop' into Weblate. 2020-03-27 10:19:37 +00:00
Bruno Windels 528c820a2b
Merge pull request #4284 from matrix-org/bwindels/showverifreqinsteadofmember
Show ongoing verification request straight away when navigating to member
2020-03-27 10:19:31 +00:00
Weblate 9a86a648b6 Merge branch 'origin/develop' into Weblate. 2020-03-27 10:17:00 +00:00
Kévin C 15f61dca35 Translated using Weblate (French)
Currently translated at 100.0% (2241 of 2241 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-03-27 10:17:00 +00:00
Bruno Windels a2737899c1
Merge pull request #4276 from matrix-org/bwindels/transparentscrollbars
Fix: allow scrolling while window is not focused & remove scrollbar hack
2020-03-27 10:16:53 +00:00
Michael Telatynski 98f9f1e956 i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 09:59:43 +00:00
Michael Telatynski a974f0fe46 blank out UserInfo avatar when changing between members
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 09:59:18 +00:00
Weblate 657addd13e Merge branch 'origin/develop' into Weblate. 2020-03-27 09:31:21 +00:00
Szimszon b538bfa7da Translated using Weblate (Hungarian)
Currently translated at 100.0% (2240 of 2240 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-03-27 09:31:21 +00:00
Stanislav Lukeš 2ec6210ebd Translated using Weblate (Czech)
Currently translated at 96.7% (2167 of 2240 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2020-03-27 09:31:16 +00:00
Jeff Huang 538816a626 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2240 of 2240 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-03-27 09:31:13 +00:00
Besnik Bleta bfee6d8319 Translated using Weblate (Albanian)
Currently translated at 99.7% (2233 of 2240 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-03-27 09:31:12 +00:00
David Baker 1f12d16b70
Merge pull request #4287 from matrix-org/dbkr/show_backup_key_cached
Show whether backup key is cached
2020-03-27 09:31:03 +00:00
Michael Telatynski 7fbfd73e11 Show modal on "instant SSO"
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 01:17:42 +00:00
David Baker ccb3283fd3 Show whether backup key is cached
in cross signing debug panel
2020-03-26 18:50:31 +00:00
Weblate c77fdcf088 Merge branch 'origin/develop' into Weblate. 2020-03-26 17:12:38 +00:00
Kenneth Larsson 1110735df9 Translated using Weblate (Swedish)
Currently translated at 68.3% (1529 of 2240 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2020-03-26 17:12:37 +00:00
Osoitz b21cf5edc6 Translated using Weblate (Basque)
Currently translated at 100.0% (2240 of 2240 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2020-03-26 17:12:31 +00:00
Bruno Windels 2bf4513b44
Merge pull request #4285 from matrix-org/bwindels/renameunverifiedsessiontoast
Rename unverified session toast
2020-03-26 17:12:25 +00:00
Bruno Windels e3e40ace81 Fix: pick last active DM for verification request 2020-03-26 17:45:59 +01:00
Bruno Windels ce77593cf9 rename toast title 2020-03-26 17:37:44 +01:00
Bruno Windels abf12a3ddf Show EncryptionPanel straight away when there is an ongoing verification request for a user 2020-03-26 17:31:31 +01:00
Bruno Windels a6fbb98252 only show close button when not in a dialog, which already has one 2020-03-26 17:02:32 +01:00
Bruno Windels 34b0c1b1e7 fix lint & other cleanup 2020-03-26 16:54:31 +01:00
Bruno Windels 9b54d15fcd add cancel button to verification panel 2020-03-26 16:53:46 +01:00
Bruno Windels 053a5a5ff4
Merge pull request #4269 from ThobyV/thobyv/hide-formatBar-on-highlight-backspacing-message
Fix formatBar not hidden after highlight and backspacing some text
2020-03-26 13:19:06 +00:00
thobyv-kismat 1713006958 recommit bwindels commited changes to refactor check logic after rebase mistake 2020-03-26 14:03:38 +01:00
David Baker 6d90307ff7
Merge pull request #4277 from matrix-org/dbkr/trust_cross_signing_flag
Add a flag to control whether cross-signing signatures are trusted
2020-03-26 12:19:14 +00:00
Weblate b2fbee0ffd Merge branch 'origin/develop' into Weblate. 2020-03-26 12:05:03 +00:00
David Baker e2bb0a3b46
Merge pull request #4281 from matrix-org/dbkr/ssss_upgrade_copy
Update copy on SSSS symmetric upgrade toast
2020-03-26 12:04:58 +00:00
Weblate 26ffcb2669 Merge branch 'origin/develop' into Weblate. 2020-03-26 12:04:56 +00:00
David Baker 091e094759
Merge pull request #4270 from matrix-org/dbkr/wait_for_upgrade_to_complete
Wait for SSSS upgrade to complete
2020-03-26 12:04:52 +00:00
Weblate 8fbdcbadb5 Merge branch 'origin/develop' into Weblate. 2020-03-26 11:55:41 +00:00
Michael Telatynski 39fdde627d
Merge pull request #4278 from matrix-org/t3chguy/e2e_copy
Update cross-signing verification copy and fix i18n
2020-03-26 11:55:36 +00:00
thobyv-kismat 2bd112ca7c add delete support and to keyboard shortcuts 2020-03-26 12:40:31 +01:00
thobyv-kismat c95b23f3ec fix formatBar not hidden after highlight-backspacing text partially 2020-03-26 12:40:31 +01:00
David Baker f7e9cf4552 i18n 2020-03-26 11:15:07 +00:00
David Baker 8a64caa925 Merge branch 'dbkr/wait_for_upgrade_to_complete' into dbkr/ssss_upgrade_copy 2020-03-26 11:14:33 +00:00
David Baker 95828ce751 Remove duplicate import 2020-03-26 11:13:57 +00:00
David Baker 8532c72fce Update copy on SSSS symmetric upgrade toast
Fixes https://github.com/vector-im/riot-web/issues/12881
2020-03-26 11:12:00 +00:00
David Baker 4586971a82 Merge remote-tracking branch 'origin/develop' into dbkr/wait_for_upgrade_to_complete 2020-03-26 11:10:07 +00:00
Weblate 7f87f9674d Merge branch 'origin/develop' into Weblate. 2020-03-26 10:55:05 +00:00
David Baker 9c20bf22ce Fix soft-crash on bad permalinks
Fixes https://github.com/vector-im/riot-web/issues/12880
2020-03-26 10:45:26 +00:00
Bruno Windels 785d0e99fb remove some remaining dead code 2020-03-26 11:17:35 +01:00
Bruno Windels 75cbc1dc07 Adjust IndicatorScrollbar to not rely on AutoHideScrollbar for overflow 2020-03-26 11:17:35 +01:00
Bruno Windels 0436507574 use transparent scrollbars on not hover to emulate scrolbar on hover
allows us to get rid of the margin-right hack as well
2020-03-26 11:17:35 +01:00
Weblate fced02e1f8 Merge branch 'origin/develop' into Weblate. 2020-03-26 10:08:30 +00:00
Szimszon 883b0afea0 Translated using Weblate (Hungarian)
Currently translated at 97.1% (2167 of 2231 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-03-26 10:08:30 +00:00
Tirifto 7d92430831 Translated using Weblate (Esperanto)
Currently translated at 99.8% (2227 of 2231 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2020-03-26 10:08:27 +00:00
Jeff Huang f448f456e1 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2231 of 2231 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-03-26 10:08:22 +00:00
Bruno Windels 44ce5b5764
Merge pull request #4267 from matrix-org/bwindels/setupcrosssigningafterskip
Fix: make self-verification wait for incoming request
2020-03-26 10:08:15 +00:00
David Baker a9e7bf9899 Merge remote-tracking branch 'origin/develop' into dbkr/trust_cross_signing_flag 2020-03-26 09:40:09 +00:00
Michael Telatynski c41b39488b Automatically redirect to SSO when the user clicks through to Login
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-25 23:35:36 +00:00
Michael Telatynski 7ca6a4b777 Iterate copy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-25 23:00:46 +00:00
Michael Telatynski be3167c870 always show Devices section
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-25 22:44:09 +00:00
Michael Telatynski d098c91c30 Update cross-signing verification copy and fix i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-25 22:38:11 +00:00
David Baker 327b3c860b Adding the files would help 2020-03-25 18:47:57 +00:00
David Baker 25e7bde7bc Add a flag to control whether cross-signing signatures are trusted
Fixes: https://github.com/vector-im/riot-web/issues/12616
2020-03-25 18:38:12 +00:00
Weblate bd91420366 Merge branch 'origin/develop' into Weblate. 2020-03-25 17:56:56 +00:00
@a2sc:matrix.org 2c1fbfb69c Translated using Weblate (German)
Currently translated at 75.5% (1685 of 2231 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-25 17:56:56 +00:00
Max Klenk 0fb4c51b2c Translated using Weblate (German)
Currently translated at 75.5% (1685 of 2231 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-25 17:56:56 +00:00
Bruno Windels 0fb96fda6e
Merge pull request #4272 from matrix-org/bwindels/safaripersisted
Fall back to non-standard persisted api for Safari
2020-03-25 17:56:47 +00:00
Bruno Windels 0097134ade
Update src/utils/StorageManager.js
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2020-03-25 17:56:35 +00:00
Weblate 8ad7ef42e9 Merge branch 'origin/develop' into Weblate. 2020-03-25 16:28:15 +00:00
Zoe f891f3e9fa lint 2020-03-25 16:08:26 +00:00
Zoe 4d63c11f26 Respond to backup key sharing requests 2020-03-25 15:16:07 +00:00
Weblate 6198ebee9f Merge branch 'origin/develop' into Weblate. 2020-03-25 15:00:11 +00:00
J. Ryan Stinnett d869ac9a69
Merge pull request #4268 from matrix-org/jryans/robust-secret-share
Log and display secret sharing cache state
2020-03-25 15:00:04 +00:00
Weblate e4c1db4f47 Merge branch 'origin/develop' into Weblate. 2020-03-25 14:26:08 +00:00
catborise 2b600e74c4 Translated using Weblate (Turkish)
Currently translated at 80.9% (1801 of 2227 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-03-25 14:26:08 +00:00
Travis Ralston a7913f4fe5
Merge pull request #4266 from matrix-org/travis/config-wrapper
Support sending config and ready events to capable widgets (Jitsi)
2020-03-25 08:26:01 -06:00
Zoe 9dd81216fb rename secret storage force-reset variable to avoid confusion 2020-03-25 14:22:33 +00:00
Bruno Windels 78b167a7ea fix typo 2020-03-25 13:40:09 +01:00
Bruno Windels 792a7b3953 don't throw here 2020-03-25 13:07:07 +01:00
Weblate 2edaad5528 Merge branch 'origin/develop' into Weblate. 2020-03-25 11:58:29 +00:00
Zoe b7013c6f5d
Merge pull request #4273 from matrix-org/foldleft/12704-key-requests
If cached keys are present in the key backup dialog, use them
2020-03-25 11:58:24 +00:00
Zoe 936a4a0022 lint 2020-03-25 11:47:07 +00:00
Zoe 8b2ae3e20f If cached keys are present in the key backup dialog, use them 2020-03-25 11:41:59 +00:00
Bruno Windels 9a5f4d9b22 fall back, don't do both on FF 2020-03-25 12:07:11 +01:00
Bruno Windels f6e9c32c48 fall back to non-standard persisted api for Safari 2020-03-25 12:04:09 +01:00
Weblate 222ddbcaf6 Merge branch 'origin/develop' into Weblate. 2020-03-25 09:01:51 +00:00
roket1428 19b17db803 Translated using Weblate (Turkish)
Currently translated at 80.1% (1783 of 2227 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-03-25 09:01:51 +00:00
Kilian Koeltzsch 718eeeade6 Translated using Weblate (German)
Currently translated at 75.4% (1679 of 2227 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-25 09:01:47 +00:00
Kévin C 297abac072 Translated using Weblate (French)
Currently translated at 100.0% (2227 of 2227 strings)

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

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-03-25 09:01:47 +00:00
Besnik Bleta 8f10223be8 Translated using Weblate (Albanian)
Currently translated at 99.7% (2220 of 2227 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-03-25 09:01:47 +00:00
Bruno Windels 8521ed1a45
Merge pull request #4265 from ThobyV/thobyv/hide-formatbar-onEnter-highlighted-message
Fix formatbar not hidden on highlighted message sent
2020-03-25 09:01:36 +00:00
David Baker be50f80314 Wait for SSSS upgrade to complete
and show a spinner while it completes
2020-03-24 19:02:57 +00:00
thobyv-kismat b817c06c6e fix failing linter tests 2020-03-24 19:09:50 +01:00
thobyv-kismat 91b9a04ede refactor:consider checking if no placeholder 2020-03-24 19:00:43 +01:00
Travis Ralston 7ea61e4105 Appease the linter 2020-03-24 10:05:57 -06:00
Bruno Windels 7d4e498257 fix lint 2020-03-24 17:03:40 +01:00
Bruno Windels 7cded53cdb fix i18n 2020-03-24 17:02:36 +01:00
Travis Ralston bdcb65de77 Support and send the config over to capable widgets
For https://github.com/vector-im/riot-web/pull/12845
2020-03-24 09:55:54 -06:00
J. Ryan Stinnett 1c802cc6af Show private key cache state in debug panel 2020-03-24 15:50:08 +00:00
J. Ryan Stinnett c53b07a35a Add logging when secrets are missing from cache 2020-03-24 15:49:51 +00:00
Bruno Windels 3e59127d12 use SetupEncryptionBody to show a dialog from "Verify this session" 2020-03-24 16:39:43 +01:00
Bruno Windels 4ff847c8a3 put CompleteSecurity state management in store
and split off a child component (SetupCrossSigningBody) that can
be reused from the "Verify this session" toast.
2020-03-24 16:10:15 +01:00
Weblate 73768a8184 Merge branch 'origin/develop' into Weblate. 2020-03-24 14:56:31 +00:00
roket1428 8ed9feb505 Translated using Weblate (Turkish)
Currently translated at 77.8% (1733 of 2227 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-03-24 14:56:30 +00:00
random ca51690bbf Translated using Weblate (Italian)
Currently translated at 100.0% (2227 of 2227 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-03-24 14:56:30 +00:00
Travis Ralston 26bda5933b
Merge pull request #4252 from matrix-org/travis/jitsi-mobile
Support Jitsi conferences sent/received on Riot Mobile and older Riot Webs
2020-03-24 08:56:22 -06:00
vejetaryenvampir aa904761ee Translated using Weblate (Turkish)
Currently translated at 77.4% (1724 of 2227 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-03-24 14:23:57 +00:00
Ege 483bd509f5 Translated using Weblate (Turkish)
Currently translated at 77.4% (1724 of 2227 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-03-24 14:22:19 +00:00
roket1428 30db3f2a4c Translated using Weblate (Turkish)
Currently translated at 77.4% (1724 of 2227 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-03-24 14:22:18 +00:00
catborise f7fa9613e0 Translated using Weblate (Turkish)
Currently translated at 77.4% (1724 of 2227 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-03-24 14:21:20 +00:00
roket1428 1d665bcba4 Translated using Weblate (Turkish)
Currently translated at 77.4% (1724 of 2227 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-03-24 14:21:20 +00:00
Weblate d326a2b2cf Merge branch 'origin/develop' into Weblate. 2020-03-24 13:34:33 +00:00
David Baker 8f0e5f76af Merge remote-tracking branch 'origin/develop' into dbkr/unify_cross_signing_checks 2020-03-24 13:27:12 +00:00
David Baker 0fce57f891 Probably OK for debugging info to access private stuff 2020-03-24 13:13:28 +00:00
Weblate 07b81f952f Merge branch 'origin/develop' into Weblate. 2020-03-24 13:12:31 +00:00
catborise a43281b9a6 Translated using Weblate (Turkish)
Currently translated at 77.5% (1724 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-03-24 13:12:31 +00:00
David Baker 96ec18a662
Merge pull request #4242 from matrix-org/dbkr/symmetric-ssss-migrate
Migration to symmetric SSSS
2020-03-24 13:12:24 +00:00
David Baker 5e1a46c656 Update for new name 2020-03-24 13:03:07 +00:00
thobyv-kismat d7953dfa6d fix formatbar not hidden on highlighted message sent 2020-03-24 13:09:06 +01:00
David Baker d6d15bc5c7 Add secret storage outdated section to advanced 2020-03-24 11:17:33 +00:00
David Baker 99f12a695d
Merge pull request #4262 from matrix-org/dbkr/priority_toasts
Always display verification request toasts on top
2020-03-24 09:51:35 +00:00
Bruno Windels edd84ffd3a
Merge pull request #4249 from matrix-org/bwindels/assumemethodswhentodevice
Fix: assume SAS is supported when starting request with .start
2020-03-23 19:39:43 +00:00
David Baker b05e704524 Use staic dialog 2020-03-23 19:04:59 +00:00
David Baker 629d85c938 No, it's fine 2020-03-23 19:01:30 +00:00
Michael Telatynski 8839383e16
Merge pull request #4261 from matrix-org/t3chguy/no_e2ee_logout
Fix logout when Olm failed to load.
2020-03-23 18:50:33 +00:00
David Baker 281bc09c9a Use unified function to check cross-signing is ready
Fixes mismatches where the Cross signing panel would say cross
signing was not ready but no toasts would appear.

Fixes https://github.com/vector-im/riot-web/issues/12796
Fixes https://github.com/vector-im/riot-web/issues/12798
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1279
2020-03-23 18:36:37 +00:00
Travis Ralston f7bf0d013c Support sending and receiving v1 Jitsi widgets
Fixes https://github.com/vector-im/riot-web/issues/12816
Fixes https://github.com/vector-im/riot-web/issues/12814
2020-03-23 10:18:30 -06:00
Travis Ralston b8ef736038
Merge pull request #4251 from matrix-org/travis/jitsi-name
Improve naming of Jitsi conferences
2020-03-23 09:55:02 -06:00
David Baker eae690f3ef Always display verification request toasts on top
As they're interactive and time-sensitive.

Fixes https://github.com/vector-im/riot-web/issues/12141
2020-03-23 15:52:59 +00:00
Michael Telatynski a5806d93aa
Merge pull request #4245 from matrix-org/t3chguy/user_id_matrix_to
Handle matrix.to user permalink in-room rather than solo
2020-03-23 15:08:17 +00:00
Michael Telatynski 1469690835 Fix logout when Olm failed to load.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-23 14:48:55 +00:00
Bruno Windels cef1fd55b2
Merge pull request #4260 from matrix-org/bwindels/filtercanon-altaliases
Fix: filter room list (again) by canonical and alternative aliases
2020-03-23 12:48:03 +00:00
Bruno Windels 51c78809e6 filter room list by canonical and alternative aliases 2020-03-23 12:34:23 +01:00
Damir Jelić 097a34e58b Merge branch 'poljar/file-panel-logging' into develop 2020-03-23 12:34:08 +01:00
Weblate 7ea0f3d122 Merge branch 'origin/develop' into Weblate. 2020-03-23 09:37:26 +00:00
catborise 00b9435f7f Translated using Weblate (Turkish)
Currently translated at 77.5% (1724 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-03-23 09:37:26 +00:00
call_xz fe7084e854 Translated using Weblate (Japanese)
Currently translated at 54.7% (1217 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2020-03-23 09:37:24 +00:00
Michael Telatynski 535345a7fa
Merge pull request #4258 from matrix-org/t3chguy/soft_crash
Migrate RoomView to React Contexts in the hope for better temporal stability
2020-03-23 09:37:17 +00:00
Weblate afd42a1d04 Merge branch 'origin/develop' into Weblate. 2020-03-22 18:56:11 +00:00
J. A. Durieux 093213a41e Translated using Weblate (Dutch)
Currently translated at 95.5% (2124 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2020-03-22 18:56:11 +00:00
Slavi Pantaleev cccdf03d64 Translated using Weblate (Bulgarian)
Currently translated at 83.4% (1855 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2020-03-22 18:56:11 +00:00
Osoitz 94cda51f97 Translated using Weblate (Basque)
Currently translated at 100.0% (2224 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2020-03-22 18:56:09 +00:00
Michael Telatynski a8861f8893 add await for _clearStorage
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-22 09:47:00 +00:00
Michael Telatynski 27ec81f1a2 Migrate RoomView to React Contexts in the hope for better temporal stability
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-22 09:41:14 +00:00
Michael Telatynski 8822bb06f1
Update WidgetUtils.js 2020-03-22 02:14:50 +00:00
Weblate 8a67e6f50f Merge branch 'origin/develop' into Weblate. 2020-03-21 17:35:08 +00:00
catborise c417245945 Translated using Weblate (Turkish)
Currently translated at 76.5% (1701 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-03-21 17:35:08 +00:00
Travis Ralston c17c47d88b
Remove null check that was fixed in another PR
See https://github.com/matrix-org/matrix-react-sdk/pull/4255
2020-03-21 11:35:07 -06:00
Karol Kosek 4c08bd6bad Translated using Weblate (Polish)
Currently translated at 60.6% (1348 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2020-03-21 17:35:06 +00:00
Nils J. Haugen 7520c75b41 Translated using Weblate (Norwegian Nynorsk)
Currently translated at 48.3% (1074 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
2020-03-21 17:35:05 +00:00
@a2sc:matrix.org 610daf5e6b Translated using Weblate (German)
Currently translated at 75.5% (1679 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-21 17:35:05 +00:00
Tentarial 945f0d77f0 Translated using Weblate (German)
Currently translated at 75.5% (1679 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-21 17:35:05 +00:00
Kévin C f895eb5a08 Translated using Weblate (French)
Currently translated at 100.0% (2224 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-03-21 17:35:05 +00:00
Jeff Huang e1c57c9748 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2224 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-03-21 17:35:04 +00:00
@a2sc:matrix.org 2b40fb4775 Translated using Weblate (German)
Currently translated at 75.4% (1678 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-21 15:30:49 +00:00
Tentarial b86deab837 Translated using Weblate (German)
Currently translated at 75.4% (1678 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-21 15:30:49 +00:00
@a2sc:matrix.org b1fc5b5cb3 Translated using Weblate (German)
Currently translated at 75.4% (1677 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-21 15:30:33 +00:00
Tentarial ed00da768b Translated using Weblate (German)
Currently translated at 75.4% (1677 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-21 15:30:33 +00:00
@a2sc:matrix.org c3e29ad56b Translated using Weblate (German)
Currently translated at 75.4% (1676 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-21 15:30:16 +00:00
Tentarial 2a44767911 Translated using Weblate (German)
Currently translated at 75.4% (1676 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-21 15:30:16 +00:00
@a2sc:matrix.org f794372483 Translated using Weblate (German)
Currently translated at 75.2% (1672 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-21 15:29:10 +00:00
Tentarial 8120b373be Translated using Weblate (German)
Currently translated at 75.2% (1672 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-21 15:29:09 +00:00
@a2sc:matrix.org bf7a79be6a Translated using Weblate (German)
Currently translated at 75.0% (1668 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-21 15:28:06 +00:00
Tentarial 011e4c2bed Translated using Weblate (German)
Currently translated at 75.0% (1668 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-21 15:28:06 +00:00
simon klemenc a3c86ec5a8 Translated using Weblate (German)
Currently translated at 75.0% (1667 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-21 15:27:34 +00:00
Tentarial 5ef0d4bef6 Translated using Weblate (German)
Currently translated at 75.0% (1667 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-21 15:27:34 +00:00
simon klemenc e0e07d6369 Translated using Weblate (German)
Currently translated at 74.9% (1666 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-21 15:27:20 +00:00
Aaron Raimist f57dc8e8ae Translated using Weblate (German)
Currently translated at 74.9% (1666 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-21 15:27:20 +00:00
Michael Telatynski 506927ad8a change to defaults
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-21 10:49:55 +00:00
Michael Telatynski ca02ff493c Fix local jitsi build url fail and missing argument
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-21 10:42:07 +00:00
Travis Ralston 94d23c815a Improve naming of Jitsi conferences
Fixes https://github.com/vector-im/riot-web/issues/12812
2020-03-20 14:19:47 -06:00
David Baker ba1d245af9 Make SSSS migration toast dismissable 2020-03-20 19:01:26 +00:00
David Baker 252972e159 Dismiss SSSS migration toast once migration done 2020-03-20 18:53:31 +00:00
Weblate 754ee4e80f Merge branch 'origin/develop' into Weblate. 2020-03-20 16:26:32 +00:00
Michael Telatynski a56e474203 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts3
 Conflicts:
	src/components/structures/LoggedInView.js
2020-03-20 16:10:27 +00:00
Weblate 7dc2ed9750 Merge branch 'origin/develop' into Weblate. 2020-03-20 16:09:53 +00:00
Michael Telatynski 064b533a4b Merge branches 'develop' and 't3chguy/shortcuts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts3
 Conflicts:
	src/components/structures/RoomView.js
2020-03-20 16:06:07 +00:00
Michael Telatynski 8a0ee2fd34 iterate PR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-20 16:00:50 +00:00
Michael Telatynski 75c3a10bfa Merge branches 'develop' and 't3chguy/shortcuts1' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts1 2020-03-20 15:57:25 +00:00
Weblate 1e09c08c48 Merge branch 'origin/develop' into Weblate. 2020-03-20 14:55:23 +00:00
Bruno Windels 39bd1da1d0 update copy 2020-03-20 15:43:05 +01:00
Bruno Windels 1620f2159b add 2020 foundation copyright 2020-03-20 15:36:58 +01:00
Bruno Windels b97b887305 fix lint 2020-03-20 15:36:58 +01:00
Bruno Windels 073c2c525f Add "legacy verify" button to untrusted session dialog 2020-03-20 15:36:58 +01:00
Bruno Windels 510b71b0e5 extract manual device verification out of device verify dialog
as the plan is to remove the latter
2020-03-20 15:36:58 +01:00
Damir Jelić 3185d6baf5 EventIndex: Add some logging to the file panel populating. 2020-03-20 13:58:29 +01:00
Bruno Windels 301b484371 ask request if method is supported rather than checking ourselves 2020-03-20 13:37:00 +01:00
Weblate 48a88fbb58 Merge branch 'origin/develop' into Weblate. 2020-03-20 10:52:08 +00:00
Weblate f8f095af82 Merge branch 'origin/develop' into Weblate. 2020-03-20 10:51:22 +00:00
Damir Jelić 519c7f9ef0 Merge branch 'poljar/empty-search-error' into develop 2020-03-20 11:51:20 +01:00
Michael Telatynski c176d1e070
Merge pull request #4247 from matrix-org/t3chguy/showHiddentEvents_spoof
Break continuation on showHiddenEvents-rendered events
2020-03-20 10:51:17 +00:00