Commit graph

22710 commits

Author SHA1 Message Date
David Baker
3087f816fe Use URL without wurl params for popout
The popout can't be assumed to have the widget API available, so
just leave these params out.
2020-04-01 13:36:13 +01:00
David Baker
d92a19ecff Remove get-config API
which is no longer necessary now the jitsi wrapper has its own
external-api script
2020-04-01 13:36:06 +01:00
David Baker
6df4a44cc1 Better support for widgets overriding their URLs
Move the URL processing into AppTile so that the widget can have a
URL used for embedding in the page and a separate one for popping
out into a browser.
2020-04-01 13:36:00 +01:00
RiotRobot
e32e9cec06 v2.3.0 2020-03-30 13:41:02 +01:00
RiotRobot
af1446e0ff Prepare changelog for v2.3.0 2020-03-30 13:41:02 +01:00
RiotRobot
d369695e22 Upgrade matrix-js-sdk to 5.2.0 2020-03-30 13:31:42 +01:00
RiotRobot
2fe0edd3eb v2.3.0-rc.1 2020-03-26 13:21:11 +00:00
RiotRobot
91f706260b Prepare changelog for v2.3.0-rc.1 2020-03-26 13:21:10 +00:00
RiotRobot
a1c83a4f0e Upgrade matrix-js-sdk to 5.2.0-rc.1 2020-03-26 13:02:54 +00: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
J. Ryan Stinnett
9933ecbbf6
Merge pull request #4282 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate
2020-03-26 12:14:01 +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
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
5986bbc561
Merge pull request #4280 from matrix-org/dbkr/fix_permalink_crash
Fix soft-crash on bad permalinks
2020-03-26 10:54:59 +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
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
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
6e8cfc2272
Merge pull request #4275 from matrix-org/foldleft/12704-key-sharing
Respond to backup key sharing requests
2020-03-25 16:28:09 +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