OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
22,730 Commits
202 Branches
546 Tags
420 MiB
Commit Graph

22730 Commits (9cf82d8743846efbaf1f40914cf24ffbbcb4f417)

Author SHA1 Message Date
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
J. Ryan Stinnett 7bdd22ae03
Merge pull request #4291 from matrix-org/bwindels/fixcantdismissdevicetoast 
Fix: can't dismiss unverified session toast when encryption hasn't been upgraded
 2020-03-27 16:14:58 +00:00
Bruno Windels 29bb7e38fe fix undismissable toasts 2020-03-27 16:45:46 +01: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
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
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
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
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
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
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