PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
22898 commits 1 branch 0 tags 338 MiB
Commit graph

22898 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Bruno Windels
785d0e99fb remove some remaining dead code 2020-03-26 11:17:35 +01:00
Bruno Windels
aed85a2183 fix style lint 2020-03-26 11:17:35 +01:00
Bruno Windels
2186023e43 css adjustments because mx_AutoHideScrollBar_offset was removed 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
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
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