OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
22,739 Commits
218 Branches
563 Tags
447 MiB
Commit Graph

22739 Commits (5c2c8ac3b0aaf58f064869a772d8f0715ac27f33)

Author SHA1 Message Date
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 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
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 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 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 4f3842d75e pick color similar to chevron for cancel X button 2020-03-26 16:58:17 +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
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
Bruno Windels 785d0e99fb remove some remaining dead code 2020-03-26 11:17:35 +01:00