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

22712 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
491dad3669
Merge pull request #4286 from matrix-org/bwindels/picklastactivedmforverifreq 
Fix: pick last active DM for verification request
 2020-03-26 17:05:17 +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
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
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
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
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