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

17705 commits

Author SHA1 Message Date
Bruno Windels
682781aa48 better word smithing 2020-02-25 13:27:59 +01:00
Bruno Windels
bd584ab236 from verification tile, also don't wait to show right panel 2020-02-25 13:27:19 +01:00
Bruno Windels
b0c87b0eaf UI spinner when clicking "they don't match" 2020-02-25 13:18:27 +01:00
Bruno Windels
2127edb7b8 show "Waiting for network" in EncryptionInfo after accepting in toast 2020-02-25 13:13:51 +01:00
Bruno Windels
569d5b6156 show right panel before waiting for .ready event to send 2020-02-25 13:13:31 +01:00
Zoe
9ed83b8648 Show a warning dialog when user indicates a new session wasn't them 2020-02-25 11:37:01 +00:00
J. Ryan Stinnett
12e8ad8f6b Show both bootstrap and reset cross-signing where appropriate 
For cases like having keys on your account but not on the current device, this
ensures we offer both bootstrap and reset as possible paths.
 2020-02-25 11:23:51 +00:00
Michael Telatynski
e63370799e make BasePlatform::setLanguage sync, handle promises internally 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-25 10:57:40 +00:00
Travis Ralston
866ed68615 Ensure DMs tagged outside of account data work in the invite dialog 
Fixes https://github.com/vector-im/riot-web/issues/12418

Includes a refactor so we don't need to litter the code with the same magic string for DM tags.
 2020-02-24 19:43:49 -07:00
Michael Telatynski
9bcea0aeca Notify electron of language changes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-24 17:11:08 +00:00
Zoe
866fdd6185
Merge pull request #4120 from matrix-org/foldleft/cancel-events 
Show cancel events as hidden events if we wouldn't usually render them
 2020-02-24 17:02:11 +00:00
Travis Ralston
2cb699ae8b
Merge pull request #4033 from TestardR/feature/padLockInviteOnly 
Collapsed room list has unaligned room tiles #4030 version 2
 2020-02-24 09:59:26 -07:00
J. Ryan Stinnett
64dc776e43
Merge pull request #4118 from matrix-org/jryans/hs-xsign-check 
Check for cross-signing homeserver support
 2020-02-24 16:58:57 +00:00
Zoe
d01c58bd41 added comment 2020-02-24 16:54:10 +00:00
Zoe
91b85cd060 show cancel events as hidden events if we wouldn't usually render them 2020-02-24 16:51:06 +00:00
Travis Ralston
d2e7cc7f19 Merge branch 'develop' into feature/padLockInviteOnly 2020-02-24 09:50:06 -07:00
Bruno Windels
818156663a don't leak if show_sas never comes (or already came) 2020-02-24 17:00:55 +01:00
J. Ryan Stinnett
a71a234622 Check for cross-signing homeserver support 
This checks the homeserver to ensure it supports cross-signing (via the versions
feature flag) before attempting bootstrapping or offering user verification.

Fixes https://github.com/vector-im/riot-web/issues/11863
 2020-02-24 15:04:34 +00:00
Zoe
381cbbabb0
Merge pull request #4106 from matrix-org/foldleft/verification-devtool 
Add verification request viewer in devtools
 2020-02-24 14:34:45 +00:00
Zoe
f3ac3554a9 include observeOnly 2020-02-24 14:17:34 +00:00
Zoe
0d3d837871 useEventEmitter hook instead of manually using code 2020-02-24 13:44:04 +00:00
Bruno Windels
2b61988d30
Merge pull request #4117 from matrix-org/bwindels/fixinfinispinneronencryptioninfo 
update phase when request prop changes
 2020-02-24 13:39:51 +00:00
Michael Telatynski
72e5313a5a
Merge pull request #4113 from matrix-org/t3chguy/fix_downloading 
Handle file downloading locally in electron rather than sending to browser
 2020-02-24 13:37:16 +00:00
J. Ryan Stinnett
f80582a51d
Merge pull request #4116 from matrix-org/jryans/rm-cider-watcher 
Remove unused CIDER setting watcher
 2020-02-24 13:10:59 +00:00
Bruno Windels
2350d102e3 update phase when request prop changes 2020-02-24 13:39:20 +01:00
J. Ryan Stinnett
8e39bd8885 Remove unused CIDER setting watcher 
This setting watcher for CIDER seems unused and logs a warning at the moment, so
this change removes it.
 2020-02-24 12:36:25 +00:00
Bruno Windels
dc85346e5c
Merge pull request #4102 from matrix-org/bwindels/aliasautocomplete 
Use alt_aliases for pills and autocomplete
 2020-02-24 12:18:07 +00:00
J. Ryan Stinnett
c0c22ba7f9
Merge pull request #4108 from matrix-org/jryans/a11y-editor-keyboard 
Add shortcuts for beginning / end of composer
 2020-02-24 12:02:03 +00:00
David Baker
9deb1602da
Merge pull request #4115 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2020-02-24 11:57:25 +00:00
Zoe
af514385b2 Avoid shadowing window.setTimeout 2020-02-24 11:53:12 +00:00
Zoe
71bdc5987b added clarifying comment 2020-02-24 11:33:49 +00:00
Bruno Windels
13b08b5fcc
Revert "Fix escaped markdown passing backslashes through" 2020-02-24 11:27:22 +00:00
Weblate
12b86f4ca3 Merge branch 'origin/develop' into Weblate. 2020-02-24 10:34:39 +00:00
catborise
ef1ba0cc87 Translated using Weblate (Turkish) 
Currently translated at 72.2% (1535 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-02-24 10:34:39 +00:00
lissitz
9a965566e3 Translated using Weblate (Spanish) 
Currently translated at 71.6% (1523 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2020-02-24 10:34:37 +00:00
Balázs Meskó
20f82e7966 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2126 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-02-24 10:34:33 +00:00
Zoe
0663ab3b87 lint, and detect new requests 2020-02-24 10:17:33 +00:00
Michael Telatynski
d6b39a33b4 get rid of target=_blank for usercontent also 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-24 01:36:48 +00:00
Michael Telatynski
0bcdf062a3 reset opener when using window.open 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-23 22:22:12 +00:00
Michael Telatynski
b2c1242207 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-23 22:19:18 +00:00
Michael Telatynski
d783ce86c8 Use noreferrer in addition to noopener for edge case browsers 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-23 22:14:29 +00:00
Michael Telatynski
d89b8b5148 Fix downloading files in electron not being sent into browser 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-23 22:10:36 +00:00
Michael Telatynski
3308152439 Fix a couple of React warnings/errors 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-23 14:10:41 +00:00
Weblate
09ea3576bb Merge branch 'origin/develop' into Weblate. 2020-02-23 00:46:49 +00:00
lissitz
d874f48779 Translated using Weblate (Spanish) 
Currently translated at 70.8% (1506 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2020-02-23 00:46:49 +00:00
Stanislav Lukeš
ff4c275b9a Translated using Weblate (Czech) 
Currently translated at 100.0% (2126 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2020-02-23 00:46:43 +00:00
Matthew Hodgson
7696f704b2 Fix two big DOM leaks which were locking Chrome solid. 
pillifyLinks leaked Pill components, which if they contained a BaseAvatar
would leak a whole DOM tree retained by the BaseAvatar's onClientSync
event listener.  This tracks the Pill containers so they can be unmounted
via unmountPills.

BasicMessageComposer set an event listener on selectionchange in onFocus
which leaked if onBlur wasn't called.  This removes it in unmount.

We've also seen Velociraptor retaining full DOM trees from RRs, which
this doesn't address as the leak is probably within Velocity, and the plan
is to replace it with CSS animations.

Should fix https://github.com/vector-im/riot-web/issues/12417
 2020-02-22 23:51:30 +00:00
Weblate
c88a443b50 Merge branch 'origin/develop' into Weblate. 2020-02-21 20:37:10 +00:00
Travis Ralston
c906b9eccf Filter out empty strings when pasting IDs into the invite dialog 
Fixes https://github.com/vector-im/riot-web/issues/12459
 2020-02-21 13:26:37 -07:00
J. Ryan Stinnett
dc6a4854ce Add shortcuts for beginning / end of composer 
This adds Ctrl/Command+Home/End shortcuts for jumping to the start and end of
the composer contents.

Fixes https://github.com/vector-im/riot-web/issues/12438
 2020-02-21 18:50:44 +00:00
Zoe
72789897a0 Quick n dirty verificatio request viewer in devtools 2020-02-21 17:15:53 +00:00
Weblate
538f6996dc Merge branch 'origin/develop' into Weblate. 2020-02-21 17:05:18 +00:00
Travis Ralston
f74b283287
Merge pull request #4091 from matrix-org/travis/qr-binary 
Use binary packing for verification QR codes
 2020-02-21 10:05:12 -07:00
Weblate
54c41ed24a Merge branch 'origin/develop' into Weblate. 2020-02-21 16:24:59 +00:00
Travis Ralston
4de2fdc5c3
Merge pull request #4099 from matrix-org/travis/invite-fixes 
Fix several small bugs with the invite/DM dialog
 2020-02-21 09:24:53 -07:00
Weblate
515fc1fbac Merge branch 'origin/develop' into Weblate. 2020-02-21 15:38:14 +00:00
Michael Telatynski
7add51e3e8
Merge pull request #4104 from matrix-org/t3chguy/null-guard-room-pills 
Apply null-guard to room pills for when we can't fetch the room
 2020-02-21 15:38:08 +00:00
Weblate
a523535948 Merge branch 'origin/develop' into Weblate. 2020-02-21 15:37:49 +00:00
Michael Telatynski
476c622a61
Merge pull request #4105 from matrix-org/t3chguy/fix_theme 
Fix theme being overridden to light even after login is completed
 2020-02-21 15:37:44 +00:00
Weblate
0d0e533c74 Merge branch 'origin/develop' into Weblate. 2020-02-21 15:19:58 +00:00
Hubert Chathi
953af6f036
add device and cross-signing public keys to rageshake info (#4097) 2020-02-21 10:19:53 -05:00
Michael Telatynski
4ed4d91b48 move to a more reusable code path 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-21 14:54:56 +00:00
Michael Telatynski
b77c2df2be Fix theme being overridden to light even after login is completed 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-21 14:40:42 +00:00
Michael Telatynski
e799691573 Apply null-guard to room pills for when we can't fetch the room 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-21 14:14:24 +00:00
Weblate
faa6e8bf6e Merge branch 'origin/develop' into Weblate. 2020-02-21 14:02:43 +00:00
Remi Reuvekamp
c1f40fa4ab Translated using Weblate (Dutch) 
Currently translated at 88.3% (1877 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-02-21 14:02:43 +00:00
Osoitz
7dac6b9b65 Translated using Weblate (Basque) 
Currently translated at 97.9% (2082 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-02-21 14:02:40 +00:00
Miren
d4972e91a3 Translated using Weblate (Basque) 
Currently translated at 97.9% (2082 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-02-21 14:02:36 +00:00
Bruno Windels
07d24038a3 fix lint 2020-02-21 14:11:30 +01:00
Bruno Windels
fada013f9e this isn't doing anything because we don't have a room when the alias is not moderated 2020-02-21 14:06:57 +01:00
Bruno Windels
2b19648786 fix cp error and lint 2020-02-21 13:35:14 +01:00
Bruno Windels
3c3839f863 show a pill as a moderated alias (canonical or alt) if available 
otherwise, display as the label in the link
 2020-02-21 13:02:41 +01:00
Bruno Windels
4219d2fcf6 style a room pill even if we don't find the room 2020-02-21 13:02:41 +01:00
Bruno Windels
f6313b51e6 also look in alt_aliases to match a pill to a room 2020-02-21 13:02:41 +01:00
Bruno Windels
16815a752b use alt_aliases instead of aliases to match a pill to a room 
when deserializing a pill
 2020-02-21 13:02:41 +01:00
Bruno Windels
8870da6c24 Add alt_aliases to room completion candidates 
but don't match on name otherwise you see multiple entries per room
when searching for a room name

Also pass the roomId to the composer autocomplete, so
it's easier to we don't need to loop through all the rooms and
it's also easier accept room with local aliases as well in the future
 2020-02-21 13:02:41 +01:00
Bruno Windels
558ae1128b use alt_aliases rather than aliases for the display alias 2020-02-21 13:02:35 +01:00
Michael Telatynski
e6d8c4a576 Merge branches 'develop' and 't3chguy/alpha_room_list' of github.com:matrix-org/matrix-react-sdk into t3chguy/alpha_room_list 2020-02-21 11:18:45 +00:00
Zoe
7d319bab7f fix ssss overwrite 2020-02-21 10:18:47 +00:00
Travis Ralston
bcb1d73c3c Appease the linter 2020-02-20 23:21:35 -07:00
Travis Ralston
8ba274a382 Allow creating a room with only yourself in it 
Fixes https://github.com/vector-im/riot-web/issues/12092
 2020-02-20 23:16:21 -07:00
Travis Ralston
f491e4222a Convert the user's last filter into a selection if possible 
Fixes https://github.com/vector-im/riot-web/issues/12440
 2020-02-20 23:10:43 -07:00
Travis Ralston
62aaa0db9a Always insert suggestions for user IDs 
Fixes https://github.com/vector-im/riot-web/issues/12419
 2020-02-20 23:02:10 -07:00
Travis Ralston
00cc253594 Always suggest a pill for MXID-looking users 
Part of https://github.com/vector-im/riot-web/issues/12440
 2020-02-20 23:02:10 -07:00
Aaron Raimist
1739b7e0cc Don't ask to enable analytics when Do Not Track is enabled 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-02-20 20:09:24 -06:00
Weblate
52f92c327a Merge branch 'origin/develop' into Weblate. 2020-02-20 17:07:59 +00:00
Bruno Windels
744826db48
Merge pull request #4096 from matrix-org/bwindels/canonicalpill 
Accept canonical alias for pills
 2020-02-20 17:07:54 +00:00
Weblate
7ca72adc88 Merge branch 'origin/develop' into Weblate. 2020-02-20 16:44:35 +00:00
MamasLT
2027f410e3 Translated using Weblate (Lithuanian) 
Currently translated at 43.1% (916 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2020-02-20 16:44:35 +00:00
J. A. Durieux
403895ebb9 Translated using Weblate (Dutch) 
Currently translated at 86.8% (1846 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-02-20 16:44:33 +00:00
Bruno Windels
d324dfaceb
Merge pull request #4094 from matrix-org/bwindels/dontsaywecanscan 
Fix: don't advertise ability to scan a QR code for verification
 2020-02-20 16:44:27 +00:00
Bruno Windels
fee9c7d21f accept canonical alias for pills 2020-02-20 17:43:33 +01:00
Weblate
b3a4526157 Merge branch 'origin/develop' into Weblate. 2020-02-20 13:58:43 +00:00
MamasLT
4cc37d13c7 Translated using Weblate (Lithuanian) 
Currently translated at 42.1% (895 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2020-02-20 13:58:43 +00:00
Damir Jelić
81e61d6f9d EventIndexPanel: Move the comments around for the getStats calls. 2020-02-20 14:46:10 +01:00
Damir Jelić
a650c47d6b ManageEventIndexDialog: Add a space before the function parenthesis. 2020-02-20 14:46:10 +01:00
Damir Jelić
1897d67818 EventIndexPanel: Catch getStats failures. 
Getting the stats can fail when used with Seshat. Tantivy periodically
garbage collects its files. Smaller files are merged and the old ones
are removed.

If garbage collection occurs while we try to get the stats, which go
trough the files and figure out their sizes, we can end up trying to
figure out the file size of a removed file. The getStats call will fail
in this case but we can ignore the failure since we will likely get a
nice result next time we try.
 2020-02-20 14:46:10 +01:00
Damir Jelić
9e3b0fdf7c EventIndexPanel: Fix the removal of the updateCurrentRoom listeners. 
The event listeners that update the current room and try to get the
current stats from the event index don't seem to be unmounted because
this != this confusion.

Turning them into arrow methods of the react class fixes this.
 2020-02-20 14:46:10 +01:00
Weblate
86300d8ce6 Merge branch 'origin/develop' into Weblate. 2020-02-20 11:57:00 +00:00
Michael Telatynski
b1a3d8ad63
Merge pull request #4092 from matrix-org/t3chguy/persist 
Use Persistent Storage where possible
 2020-02-20 11:56:54 +00:00
Bruno Windels
fb28bbbaa6 dont say we can scan when we dont 2020-02-20 12:06:34 +01:00
Weblate
63a5da06e7 Merge branch 'origin/develop' into Weblate. 2020-02-20 11:01:21 +00:00
Bruno Windels
86c871f55f
Merge pull request #4088 from matrix-org/bwindels/fixuserpage 
Fix user page (missing null check)
 2020-02-20 11:01:15 +00:00
Weblate
a775d9dbf8 Merge branch 'origin/develop' into Weblate. 2020-02-20 11:00:09 +00:00
MamasLT
c04eef6521 Translated using Weblate (Lithuanian) 
Currently translated at 42.1% (894 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2020-02-20 11:00:09 +00:00
Bruno Windels
913caf67a9
Merge pull request #4081 from matrix-org/bwindels/cancelondialogclose 
Cancel verification request on dialog close
 2020-02-20 11:00:00 +00:00
Weblate
25deb7e411 Merge branch 'origin/develop' into Weblate. 2020-02-20 03:01:33 +00:00
Walter
10f90be5af Translated using Weblate (Russian) 
Currently translated at 81.1% (1725 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-02-20 03:01:33 +00:00
Michael Telatynski
16bbea0b59 Fix various leaks due to method re-binding 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-20 02:35:30 +00:00
Michael Telatynski
ffde11ca91 Use Persistent Storage where possible 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-20 00:38:08 +00:00
Travis Ralston
760a472be5 Appease the linter 2020-02-19 17:05:32 -07:00
Travis Ralston
3b6a201d4e Add comments 2020-02-19 17:03:50 -07:00
Travis Ralston
45963adeb4 Use binary packing for verification QR codes 
Fixes https://github.com/vector-im/riot-web/issues/12257
Fixes https://github.com/vector-im/riot-web/issues/12375

We do not remove the existing QR code library in this commit because it is still used elsewhere (like the share dialog). 

This should be as accurate as possible to what [MSC1543](https://github.com/matrix-org/matrix-doc/pull/1544) asks for.
 2020-02-19 17:02:14 -07:00
Weblate
9acd1e7d64 Merge branch 'origin/develop' into Weblate. 2020-02-19 17:41:34 +00:00
Michael Telatynski
12eb408c58
Merge pull request #4073 from matrix-org/t3chguy/a11y_share_msg 
Fix share message context menu option keyboard a11y
 2020-02-19 17:41:28 +00:00
Michael Telatynski
f074e85863 tidy up 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-19 16:35:05 +00:00
Tentarial
fa39021387 Translated using Weblate (German) 
Currently translated at 75.6% (1608 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-02-19 16:05:00 +00:00
Remi Reuvekamp
df897b4734 Translated using Weblate (Dutch) 
Currently translated at 86.6% (1841 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-02-19 16:04:57 +00:00
Michael Telatynski
5a31b308cd remove unused clause 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-19 15:09:05 +00:00
Michael Telatynski
d1503d8a65 fix edge case 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-19 14:55:49 +00:00
Michael Telatynski
a6edc34e97 Iterate things 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-19 14:52:00 +00:00
Michael Telatynski
d70a9bd001 small tweaks, still not working reliably 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-19 14:39:36 +00:00
Weblate
b856c2e8d5 Merge branch 'origin/develop' into Weblate. 2020-02-19 14:34:36 +00:00
Tentarial
ca680e56fc Translated using Weblate (German) 
Currently translated at 72.6% (1544 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-02-19 14:34:36 +00:00
Tentarial
46fcb7d348 Translated using Weblate (German) 
Currently translated at 72.6% (1544 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-02-19 14:34:35 +00:00
Bruno Windels
a5b9682572 show spinner while loading local aliases 2020-02-19 15:15:05 +01:00
Weblate
fb7cc02b62 Merge branch 'origin/develop' into Weblate. 2020-02-19 14:04:15 +00:00
Damir Jelić
7f71e551da EventIndex: Split out the statements that check for a valid event type. 2020-02-19 14:50:59 +01:00
Damir Jelić
156c6b8db8 EventIndex: Document the return value of the isValidEvent method. 2020-02-19 14:50:59 +01:00
Damir Jelić
59f8b4f6b1 EventIndex: Don't index key verification events. 
Since cross-signing is a thing key verification events have become part
of the timeline and room history.

Those events are m.room.message events for backwards compatibility, so
clients that don't support key verification in the timeline print out a
fall-back message.
 2020-02-19 14:50:59 +01:00
Michael Telatynski
4278d44059 Merge branches 'develop' and 't3chguy/alpha_room_list' of github.com:matrix-org/matrix-react-sdk into t3chguy/alpha_room_list 2020-02-19 13:30:47 +00:00
Weblate
2e1334238c Merge branch 'origin/develop' into Weblate. 2020-02-19 12:53:07 +00:00
Michael Telatynski
b1b17a313e
Merge pull request #4046 from matrix-org/t3chguy/usercontent 
Get rid of dependence on usercontent.riot.im
 2020-02-19 12:53:01 +00:00
Michael Telatynski
4da5f32764 get rid of lockOrigin backwards compatibility 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-19 12:44:46 +00:00
Weblate
48787d5f4e Merge branch 'origin/develop' into Weblate. 2020-02-19 10:28:50 +00:00
Bruno Windels
30ae6dbdbb also detect aliases using new /aliases endpoint for room access settings 2020-02-19 11:18:56 +01:00
Weblate
a9fe810bab Merge branch 'origin/develop' into Weblate. 2020-02-19 10:03:00 +00:00
Walter
48ef8e84e6 Translated using Weblate (Russian) 
Currently translated at 80.9% (1719 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-02-19 10:03:00 +00:00
random
ad8255e31a Translated using Weblate (Italian) 
Currently translated at 100.0% (2126 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-02-19 10:02:59 +00:00
Szimszon
6c9d489ef7 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2126 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-02-19 10:02:58 +00:00
Tentarial
7460ddfada Translated using Weblate (German) 
Currently translated at 71.1% (1512 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-02-19 10:02:58 +00:00
Kévin C
2273b8606b Translated using Weblate (French) 
Currently translated at 100.0% (2126 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-02-19 10:02:56 +00:00
Jeff Huang
d7a6296100 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2126 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-02-19 10:02:56 +00:00
Bruno Windels
cb5882d59b add null check 2020-02-19 10:40:00 +01:00
Bruno Windels
4c9c57bfe5 check server feature flag 
if not available, revert to old behavior
 2020-02-19 10:06:52 +01:00
Bruno Windels
e6ca581f10 get local aliases from /aliases in room settings 2020-02-18 16:27:45 +01:00
Michael Telatynski
600cb64d00 don't nest <a> inside <AccessibleButton> 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-18 15:04:57 +00:00
Michael Telatynski
932c9b3106 First attempt alpha room list sorting 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-18 14:55:12 +00:00
Weblate
246a903fe8 Merge branch 'origin/develop' into Weblate. 2020-02-18 13:54:03 +00:00
Miren
27bae86c0c Translated using Weblate (Basque) 
Currently translated at 97.6% (2074 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-02-18 13:54:03 +00:00
Besnik Bleta
01f8a1e01f Translated using Weblate (Albanian) 
Currently translated at 99.7% (2119 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-02-18 13:54:02 +00:00
Zoe
27f65c17b5
Merge pull request #4080 from matrix-org/foldleft/12187-e2e-dm 
Start verification sessions in an E2E DM where possible
 2020-02-18 13:53:56 +00:00
Zoe
0e0aadd3f2 fixed inexplicible scope bug 2020-02-18 11:30:10 +00:00
Zoe
164b355ffe abstract out the check for available target devices 2020-02-18 11:25:19 +00:00
Weblate
f8dc10f820 Merge branch 'origin/develop' into Weblate. 2020-02-18 10:16:07 +00:00
Bruno Windels
1b38827d92
Merge pull request #4077 from matrix-org/bwindels/filterverifmethods 
Only show supported verification methods
 2020-02-18 10:16:01 +00:00
Bruno Windels
46e63fd571 cancel on dialog close 2020-02-18 11:14:16 +01:00
Weblate
4520886cde Merge branch 'origin/develop' into Weblate. 2020-02-18 09:55:44 +00:00
catborise
025d028893 Translated using Weblate (Turkish) 
Currently translated at 71.7% (1521 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-02-18 09:55:44 +00:00
Walter
0c3d247948 Translated using Weblate (Russian) 
Currently translated at 80.8% (1714 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-02-18 09:55:41 +00:00
Tuomas Hietala
c97bcc39f9 Translated using Weblate (Finnish) 
Currently translated at 89.5% (1899 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2020-02-18 09:55:40 +00:00
Remi Reuvekamp
20a8fc1620 Translated using Weblate (Dutch) 
Currently translated at 85.2% (1808 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-02-18 09:55:38 +00:00
Bruno Windels
05403eb98c
Merge pull request #4072 from matrix-org/bwindels/localecho2 
Use local echo in VerificationRequest for accepting/declining a verification request
 2020-02-18 09:55:27 +00:00
Zoe
28df1e28cf Start verification sessions in an E2E DM where possible 
Fixes https://github.com/vector-im/riot-web/issues/12187
 2020-02-17 15:08:22 +00:00
progserega
0325fdd37b Translated using Weblate (Russian) 
Currently translated at 80.1% (1699 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-02-17 13:37:07 +00:00
Walter
ed7702b01c Translated using Weblate (Russian) 
Currently translated at 80.1% (1699 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-02-17 13:37:07 +00:00
random
9f466477bd Translated using Weblate (Italian) 
Currently translated at 100.0% (2121 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-02-16 11:24:36 +00:00
Szimszon
f3dd8ecd00 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2121 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-02-16 11:24:34 +00:00
Kévin C
50886ff127 Translated using Weblate (French) 
Currently translated at 100.0% (2121 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-02-16 11:24:34 +00:00
MadsDyrmann
417774f609 Translated using Weblate (Danish) 
Currently translated at 24.3% (515 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/da/
 2020-02-16 11:24:33 +00:00
Jeff Huang
adaef02fca Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2121 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-02-16 11:24:33 +00:00
Besnik Bleta
d19cbe4afa Translated using Weblate (Albanian) 
Currently translated at 99.7% (2114 of 2121 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-02-16 11:24:32 +00:00
Weblate
f404885a54 Merge branch 'origin/develop' into Weblate. 2020-02-14 21:40:54 +00:00
jja2000
f8509a40a4 Translated using Weblate (Dutch) 
Currently translated at 83.1% (1762 of 2120 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-02-14 21:40:54 +00:00
J. Ryan Stinnett
4e2887ded6
Merge pull request #4078 from matrix-org/jryans/report-experimental-envs 
Report installed PWA, touch input status in rageshakes, analytics
 2020-02-14 21:40:48 +00:00
J. Ryan Stinnett
ca28f83841 Report touch input status in rageshakes, analytics 
This reports whether the device has touch input as a primary input mechanism in
rageshakes and analytics.

For analytics, this replaces the identity server (which ends up being reported
as "<redacted>" by default anyway) because Matomo only supports a limited number
of custom variables.
 2020-02-14 17:36:14 +00:00
J. Ryan Stinnett
ca4f591cb6 Report installed PWA status in rageshakes, analytics 
This adds installed PWA status reporting to rageshakes and analytics, as well as
cleaning up some related strings.
 2020-02-14 16:30:07 +00:00
Hubert Chathi
4a204b715d
Merge pull request #4059 from matrix-org/uhoreg/refactor_event_grouping 
refactor event grouping into separate helper classes
 2020-02-14 10:35:34 -05:00
Bruno Windels
93674ec781
Merge pull request #4070 from matrix-org/bwindels/oneverifrequest 
Find existing requests when starting a new verification request
 2020-02-14 15:33:27 +00:00
Bruno Windels
30718e7fde unsent could potentially also happen here 
although should not happen in practice
 2020-02-14 13:48:38 +01:00
Bruno Windels
a6c072ab42 only show supported verification methods 
also an error message if none match
 2020-02-14 13:48:18 +01:00
Michael Telatynski
8087f18bf7 Remove unused props 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-14 10:32:42 +00:00
Marco Zehe
b83bc7db68 Always speak the full text of the typing indicator when it updates. 
By default, aria-live regions only speak partial updates. However in the case of the typing indicator, if it goes from one person typing to several, and back, the updated text would only be spoken in fragments by screen readers. Adding the aria-atomic attribute with a value of true makes screen readers always speak the full update for this tile, making the experience much nicer.

Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
 2020-02-14 11:12:41 +01:00
Michael Telatynski
42b63fbc81 Fix share message context menu option keyboard a11y 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-14 09:36:10 +00:00
Bruno Windels
43f15ab47d
Merge pull request #4008 from BobVul/fix-markdown-escapes 
Fix escaped markdown passing backslashes through
 2020-02-14 09:18:53 +00:00
Michael Telatynski
256659e6f8
Merge pull request #4071 from MarcoZehe/MoveSidebarTabs 
Move the sidebar to below the sidebar tab buttons for screen readers.
 2020-02-13 18:31:25 +00:00
Marco Zehe
7840aa74fd Fix ID to be namespaced 
Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
 2020-02-13 19:18:21 +01:00
Michael Telatynski
8ea13d9b57 delint prefer let/const over var 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-13 17:05:48 +00:00
Michael Telatynski
4ed27a4ba6 Move bulk to react-sdk and reference it from riot-web land 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-13 16:58:27 +00:00
Michael Telatynski
627a4d4ea4 Update comments and such 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-13 16:53:45 +00:00
Michael Telatynski
12aae12218 Merge branches 'develop' and 't3chguy/usercontent' of github.com:matrix-org/matrix-react-sdk into t3chguy/usercontent 2020-02-13 16:36:05 +00:00
Bruno Windels
3292991491 provide specific label for when accepting/declining is in progress 
also distuingish between cancelling and declining
 2020-02-13 17:29:38 +01:00
Bruno Windels
3eb07465f7 use canAccept in tile, which takes local echo into account 2020-02-13 17:29:13 +01:00
Bruno Windels
3ec0301f9d use canAccept in toast, which takes local echo into account 2020-02-13 17:28:10 +01:00
Zoe
786d853f4c
Merge pull request #4067 from matrix-org/foldleft/12191-pull-big-tooltip 
don't show tooltips on big icons
 2020-02-13 15:22:09 +00:00
Marco Zehe
6319407cab Move the sidebar to below the sidebar tab buttons for screen readers. 
Do this by aria-owning the sidebar into the header wrapper. aria-owned subtrees get added as the last child after all other child elements that are in the DOM. This way, if a sidebar tab is activated, the aside element now is inserted in a position following the tabs, before the main messages list. The association for screen readers is therefore more logical. This has no bearing on the DOM order or CSS properties. aria-owns simply rearranges the accessibility tree.

Fixes vector-im/riot-web/issues/11319

Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
 2020-02-13 16:02:58 +01:00
Zoe
37f1104f61 lint 2020-02-13 14:15:08 +00:00
Zoe
c3af1a2f95 don't be too magic about hiding tooltips 2020-02-13 13:47:39 +00:00
Bruno Windels
4b7cc12daa check if there is already a request in progress when clicking verify 
and go straight there instead of first showing EncryptionInfo panel
 2020-02-13 14:34:44 +01:00
Bruno Windels
68197a1d18 also update phase after starting request 
as it might now be a request that is already ongoing
 2020-02-13 14:33:35 +01:00
Bruno Windels
d49fbf25f7 check if verifier sasEvent was already set on mount 
this allow the verification panel to fully recover
the UI state from an on-going verification request
 2020-02-13 14:32:33 +01:00
Weblate
ccb88cd422 Merge branch 'origin/develop' into Weblate. 2020-02-13 12:46:38 +00:00
Michael Telatynski
4952b5b001
Merge pull request #4068 from matrix-org/t3chguy/piwik_csp 
Fix sending of visit variables to Matomo
 2020-02-13 12:46:33 +00:00
Michael Telatynski
f53c415504 Fix sending of visit variables 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-13 11:50:40 +00:00
Weblate
6ed8a7593e Merge branch 'origin/develop' into Weblate. 2020-02-13 10:59:08 +00:00
Michael Telatynski
12c743b160
Merge pull request #4066 from matrix-org/t3chguy/piwik_csp 
Use embedded piwik script rather than piwik.js to respect CSP
 2020-02-13 10:59:02 +00:00
Michael Telatynski
0c4ee0091e Update comment and clear up localstorage on disabling 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-13 10:47:50 +00:00
Zoe
9649f2a2da don't show tooltips on big icons 
fixes: https://github.com/vector-im/riot-web/issues/12191
 2020-02-13 10:11:57 +00:00
Weblate
93c412c584 Merge branch 'origin/develop' into Weblate. 2020-02-13 08:51:44 +00:00
Szimszon
98e8fed26e Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2120 of 2120 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-02-13 08:51:43 +00:00
Bruno Windels
ec708b5e9b
Merge pull request #4058 from matrix-org/bwindels/dontpassmethodstoverify 
remove methods arg to requestVerification(DM)
 2020-02-13 08:51:36 +00:00
Michael Telatynski
8d445d54ec Use embedded piwik caller rather than piwik.js bcuz CSP :D 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-13 00:39:28 +00:00
Weblate
d6d0831c16 Merge branch 'origin/develop' into Weblate. 2020-02-12 17:44:44 +00:00
Travis Ralston
d172e1bf85 Revert "Merge pull request #4060 from matrix-org/travis/better-invite" 
This reverts commit 48860f0a10.
 2020-02-12 10:44:27 -07:00
Weblate
8ce73192cc Merge branch 'origin/develop' into Weblate. 2020-02-12 17:04:32 +00:00
Travis Ralston
b514f89594
Merge pull request #4061 from matrix-org/travis/fix-settings-handling 
Check for null config settings a bit safer
 2020-02-12 10:04:26 -07:00
Weblate
8943546fd9 Merge branch 'origin/develop' into Weblate. 2020-02-12 17:03:40 +00:00
Travis Ralston
48860f0a10
Merge pull request #4060 from matrix-org/travis/better-invite 
Score user ID searches higher when they match nearly exactly
 2020-02-12 10:03:33 -07:00
Weblate
8cabf45ec4 Merge branch 'origin/develop' into Weblate. 2020-02-12 14:10:33 +00:00
Besnik Bleta
13e03bb696 Translated using Weblate (Albanian) 
Currently translated at 99.7% (2113 of 2120 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-02-12 14:10:33 +00:00
Zoe
e1608509d0 Disable 'start' button after clicking in VerificationPanel 2020-02-12 13:53:16 +00:00
Weblate
aba11f0a2f Merge branch 'origin/develop' into Weblate. 2020-02-12 11:18:37 +00:00
Zoe
466d4a3e51
Merge pull request #4057 from matrix-org/foldleft/12221-secret-storage 
Fixed bug where key reset didn't always return the right key
 2020-02-12 11:18:32 +00:00
Weblate
72f1c2a763 Merge branch 'origin/develop' into Weblate. 2020-02-12 10:04:54 +00:00
Szimszon
3c5abf1fc4 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2119 of 2119 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-02-12 10:04:53 +00:00
Kévin C
790ed65a17 Translated using Weblate (French) 
Currently translated at 100.0% (2119 of 2119 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-02-12 10:04:52 +00:00
Jeff Huang
37435bce45 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2119 of 2119 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-02-12 10:04:51 +00:00
Marco Zehe
8004a35179 Update to use proper quotes and fix code styling. And fix test. 
Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
 2020-02-12 10:54:08 +01:00
Marco Zehe
6fe4eb1fc3 Don't render avatars in pills for screen readers. 
These don't provide any additional information, but add extraneous noise. The link text and title already provide all information. Therefore, mark the avatar inside pills (the mention links inside messages) as hidden. Note that due to the images being part of something focusable, role "presentation" does not work here.

Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
 2020-02-12 09:36:59 +01:00
Travis Ralston
a05dafc300 Check for null config settings a bit safer 
Fixes https://github.com/vector-im/riot-web/issues/12254
 2020-02-12 01:58:21 +00:00
Travis Ralston
9acf70c693 Score user ID searches higher when they match nearly exactly 2020-02-12 01:55:20 +00:00
Hubert Chathi
be70ef44f8 lint 2020-02-11 15:34:14 -05:00
Hubert Chathi
4c5046afd5 refactor event grouping into separate helper classes 2020-02-11 15:19:32 -05:00
Zoe
c8e65bfa65 flip sense of 'force' flag in if statement 2020-02-11 17:56:25 +00:00
Bruno Windels
33f3a61b94 remove unused imports 2020-02-11 18:23:05 +01:00
Bruno Windels
a1844e44f2 remove methods arg to requestVerification(DM) 
as it's easy to have this argument be out of sync from all
the places this is called from the js-sdk. There is also little point,
as you can already specify the methods a consumer of the js-sdk
wants to provide through the verificationMethods option when creating
the client object.
 2020-02-11 18:22:48 +01:00
Weblate
99bbc2bdae Merge branch 'origin/develop' into Weblate. 2020-02-11 17:20:46 +00:00
Bruno Windels
91c9c00712
Merge pull request #4044 from matrix-org/bwindels/riotx-qr-compat 
Make QR self-verification compatible with RiotX
 2020-02-11 17:20:40 +00:00
Zoe
5382a52519 Fixed bug where key reset didn't always return the right key 2020-02-11 15:57:14 +00:00
Weblate
a56d21d80a Merge branch 'origin/develop' into Weblate. 2020-02-11 15:35:30 +00:00
Bruno Windels
7a026eb15d
Merge pull request #4043 from matrix-org/bwindels/showunverifieddevicedialogonclick 
Verify single device from other user in right panel & Not Trusted dialog
 2020-02-11 15:35:24 +00:00
Weblate
0e366c3ddd Merge branch 'origin/develop' into Weblate. 2020-02-11 15:35:06 +00:00
Bruno Windels
1d39aa6a81
Merge pull request #4049 from matrix-org/bwindels/verifybuttonsdisable 
Disable verification buttons after clicking to avoid double submission
 2020-02-11 15:35:00 +00:00
Weblate
f206baadd1 Merge branch 'origin/develop' into Weblate. 2020-02-11 15:34:32 +00:00
Bruno Windels
703f52be33
Merge pull request #4048 from matrix-org/bwindels/toasttuning 
Verification toast fixes
 2020-02-11 15:34:26 +00:00
Bruno Windels
5267dbf44a
Update src/components/views/right_panel/UserInfo.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-02-11 15:21:01 +00:00
Weblate
628be1e90a Merge branch 'origin/develop' into Weblate. 2020-02-11 15:16:54 +00:00
Bruno Windels
a84e90df51
Merge pull request #4042 from matrix-org/bwindels/encryptionpaneleverywhere 
Use EncryptionPanel everywhere, part I
 2020-02-11 15:16:47 +00:00
Weblate
ae237901b0 Merge branch 'origin/develop' into Weblate. 2020-02-11 13:44:08 +00:00
Zoe
e54d34090a
Merge pull request #4056 from matrix-org/foldleft/12221-temp-remove 
quick fix for cross-signing reset bug
 2020-02-11 13:44:02 +00:00