mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 09:01:30 +03:00
Code Issues Projects Releases Packages Wiki Activity
25811 commits 219 branches 562 tags 474 MiB
Commit graph

10860 commits

Author SHA1 Message Date
Jorik Schellekens
b27334f448 Use lower case import 2020-06-16 15:52:35 +01:00
Travis Ralston
8f45e06844 Add a home button to the new room list menu when available 2020-06-16 08:46:48 -06:00
Jorik Schellekens
17dbb1ac8b Message preview for font slider 2020-06-16 15:41:10 +01:00
Michael Telatynski
c11bc766a5
Merge pull request #4764 from matrix-org/t3chguy/regression/search_timestamp 
use group layout for search results
 2020-06-16 14:31:08 +01:00
Michael Telatynski
2d7726c623
Merge pull request #4759 from matrix-org/t3chguy/admin-tools-pl-defaults 
User Info default power levels for ban/kick/redact to 50 as per spec
 2020-06-16 13:45:58 +01:00
Travis Ralston
84e60ee439 Add a 'show less' button to the new room list 2020-06-15 20:00:09 -06:00
Travis Ralston
4186070489 Support list collapsing and jumping 
Fixes https://github.com/vector-im/riot-web/issues/14036
 2020-06-15 19:47:43 -06:00
Michael Telatynski
7dad8f47d3 use group layout for search results 2020-06-16 00:51:11 +01:00
Jorik Schellekens
02ccdcb802 Fix field width and add tooltip 2020-06-15 17:42:30 +01:00
Jorik Schellekens
aee9cd51a0 Remove shadowed variable 2020-06-15 16:34:56 +01:00
Jorik Schellekens
edb6bbc6c0 Implement font selection 2020-06-15 15:33:52 +01:00
David Baker
b02e439b8b Matrix client is no longer returned by onLoggedIn 
It seems non-obvious that it should do, and the doc saying it should
do seems to have disappeared.
 2020-06-15 15:18:57 +01:00
Travis Ralston
8596905cee Merge branch 'develop' into travis/room-list/sticky 2020-06-15 06:54:27 -06:00
David Baker
3d1ec9effb
typo 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-15 12:59:38 +01:00
Jorik Schellekens
94f52c4ee2
Merge pull request #4731 from matrix-org/joriks/radio-buttons 
Change theme selector to use new styled radio buttons
 2020-06-15 12:51:02 +01:00
David Baker
a75dfca73e Comment on when we start waiting for the first sync 2020-06-15 12:11:45 +01:00
David Baker
404798d27c Merge remote-tracking branch 'origin/develop' into dbkr/support_no_ssss 2020-06-15 11:36:39 +01:00
David Baker
8ebae4c3b6
Merge pull request #4686 from matrix-org/dbkr/recovery_keys_over_passphrases 
Use recovery keys over passphrases
 2020-06-15 11:30:30 +01:00
Travis Ralston
eeac80096c Float the badges with the sticky headers 2020-06-13 19:07:19 -06:00
Travis Ralston
c26c79bda8 Remove dead code 2020-06-13 19:02:21 -06:00
Michael Telatynski
63ad7640bf User Info default power levels for ban/kick/redact to 50 as per spec 2020-06-14 01:35:24 +01:00
Travis Ralston
1bbf2e053b Initial attempt at sticky headers 
Docs enclosed in diff.
 2020-06-13 11:55:11 -06:00
Travis Ralston
9eb965878a
Merge pull request #4754 from matrix-org/travis/room-list/per-list-algo 
Support per-list options and algorithms on the new room list
 2020-06-12 08:40:23 -06:00
J. Ryan Stinnett
de003bc78f
Merge pull request #4755 from matrix-org/jryans/send-read-marker-immed 
Send read marker updates immediately after moving visually
 2020-06-12 15:38:08 +01:00
J. Ryan Stinnett
39c28e2207 Send read marker updates immediately after moving visually 
The `TimelinePanel` uses two timers to coordinate read marker and read receipt
updates. When the read receipt timer fires, we advance the receipt and send the
latest state of both your receipt and marker to the server. When the read marker
timer fires, we advance the marker visually, but do not send anything to the
server: we were relying on the slightly different schedule of the read receipt
to actually send the updated read marker. This means there's a time window where
it's possible to visually advance the read marker without ever sending it to the
server (if you change rooms before the receipt timer fires again).

To simplify the behaviour here and ensure we always commit the updated marker
when we move it, this change sends an update to the server at the same time as
moving the marker.

It's possible this may improve some of the behaviour reported in
https://github.com/vector-im/riot-web/issues/12338.
 2020-06-12 14:34:57 +01:00
Travis Ralston
4aa15ee191 Wire up the context menu to the room list store 
Updates are passed along magically to the sublist, so we don't need to listen for the room list store's response to our changes.

This just hits the functions introduced in the last commit.
 2020-06-11 22:04:10 -06:00
Travis Ralston
2c04a56784 Add a minimized view to the new room list 
This covers everything except breadcrumbs, as those are somewhat undecided from a design perspective.
 2020-06-11 14:39:28 -06:00
Travis Ralston
2e04414331
Merge pull request #4750 from matrix-org/travis/room-list/leak 
Add some resource leak protection to new room list badges
 2020-06-11 12:33:11 -06:00
Jorik Schellekens
3dd49cae97 use checkbox for compact layout 2020-06-11 12:29:10 +01:00
Jorik Schellekens
cf392af52f Address design issues and set theme at device level 2020-06-11 12:27:09 +01:00
Jorik Schellekens
0f685eb0e9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/radio-buttons 2020-06-11 11:03:54 +01:00
Travis Ralston
6ccb566587 Show message previews on the new room list tiles 
They're heavily cached.
 2020-06-10 18:37:59 -06:00
Travis Ralston
d1c2ecb6cc Add some resource leak protection to new room list badges 
Most of the leaks were because we never set `this.rooms` in the notification state, which meant we were constantly triggering the `diff.added` loop.
 2020-06-10 16:04:27 -06:00
Travis Ralston
0f16d7f32d Merge branch 'develop' into travis/room-list/layout 2020-06-10 15:53:33 -06:00
Michael Telatynski
ed7f4755cc use ButtonEvent instead of MouseEvent | KeyboardEvent for AccessibleButton (make CI happy) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-10 22:05:29 +01:00
Travis Ralston
be366bdd7f Fix various layout concerns with the new room list 
It had ~32px of overflow causing a horizontal scrollbar. Turns out the layout engine gets confused when hidden elements are at the end of a flexbox, so we just move them higher in the DOM (where they logically still make sense).

The remaining changes are all alignment and misc changes in that respect, and probably not obvious.
 2020-06-10 15:05:17 -06:00
Michael Telatynski
601e8209d8 Prioritize text on the clipboard over file 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-10 21:48:39 +01:00
Jorik Schellekens
b63d73e3b6
Merge pull request #4729 from matrix-org/joriks/appearance-tab 
Move Settings flag to ts
 2020-06-10 16:57:18 +01:00
Jorik Schellekens
737fc46b87 Inline kind classnames 2020-06-10 16:48:34 +01:00
Jorik Schellekens
52c7577972 Clean up interfaces and classname 2020-06-10 15:57:28 +01:00
Travis Ralston
72bb89d4ee
Merge pull request #4743 from matrix-org/travis/room-list/tile-menu 
Add a context menu to rooms in the new room list
 2020-06-10 07:46:09 -06:00
Travis Ralston
a3391d9a08 Merge branch 'develop' into travis/room-list/hover-state 2020-06-10 07:42:41 -06:00
Travis Ralston
78e1db9d30
Merge pull request #4741 from matrix-org/travis/room-list/resize-handle 
Update resize handle for new designs in new room list
 2020-06-10 07:40:34 -06:00
Travis Ralston
a4ea5b5902
Merge pull request #4740 from matrix-org/travis/room-list/stability-1 
Improve general stability in the new room list
 2020-06-10 07:40:07 -06:00
Travis Ralston
95b4abba3b
Merge pull request #4735 from matrix-org/travis/room-list/breadcrumbs 
Reimplement breadcrumbs for new room list
 2020-06-10 07:39:55 -06:00
Jorik Schellekens
04d91ae0af Fix code review issues 
- interfaces go to the top
- fix comma conflation
- value no generic
- optionalised props
- line lints
 2020-06-10 14:11:36 +01:00
Jorik Schellekens
9787b4d640
Even more lines 2020-06-10 13:50:09 +01:00
Jorik Schellekens
0ec0bbecda
lint more lines 2020-06-10 13:49:52 +01:00
Jorik Schellekens
0fb6846c9d Radio buttons 2020-06-10 13:03:00 +01:00
Damir Jelić
eaca8310d3 Merge branch 'develop' into poljar/seshat-search-pagination 2020-06-10 13:34:09 +02:00
Travis Ralston
0755b4c148 Add a context menu to rooms in the new room list 
The tag options are not implemented out of concern for diff size. 

This splits the context menu classes out to a new "iconized" style which is common across a number of context menus, including the UserMenu.

Some of the badge/sublist styles had to change to better accommodate the menu icon lining up.

This also contains the framework required for https://github.com/vector-im/riot-web/issues/13961
 2020-06-09 23:09:15 -06:00
Travis Ralston
2180a56074 Remove irrelevant property 2020-06-09 21:15:38 -06:00
Travis Ralston
111394df6d Add hover states and basic context menu to new room list 
The 'sort by' radio buttons are blocked by https://github.com/matrix-org/matrix-react-sdk/pull/4731 as it contains the styles needed.

The 'unread rooms' checkbox is intentionally not hooked up. This is a more complicated refactoring that needs to be done.

The message preview checkbox works, though the previews remain hardcoded in this change. The primary intent of this change is to have a good enough context menu and the hover states.

The hover states are as described in the design.
 2020-06-09 21:12:49 -06:00
Travis Ralston
5f8b7187cf Update resize handle for new designs 
The diff should have information on what this does and how it is supposed to work.
 2020-06-09 19:48:31 -06:00
Travis Ralston
b84af372b9 Bump animation time for breadcrumbs up to 640ms 
This matches the design, unlike the 300ms which was too fast.
 2020-06-09 15:35:07 -06:00
Travis Ralston
fed52f274e Fix custom theme use with new room list 
Fixes https://github.com/vector-im/riot-web/issues/13968

We were grabbing "custom-" instead of the actual theme name.
 2020-06-09 15:23:34 -06:00
Travis Ralston
1467191a5d Update the CSS transition for breadcrumbs 
The actual transition length might need adjusting, but this is fairly close to what was requested.
 2020-06-09 15:06:54 -06:00
Travis Ralston
b5f9c4ba8a Merge branch 'develop' into travis/room-list/breadcrumbs 2020-06-09 08:12:56 -06:00
Travis Ralston
9377fa513f Merge branch 'develop' into travis/room-list/breadcrumbs 2020-06-09 08:11:08 -06:00
Travis Ralston
eefc40e0f8 Use IDestroyable instead of IDisposable 
For consistency within our project
 2020-06-09 08:08:47 -06:00
Travis Ralston
724f545b4a Merge remote-tracking branch 'origin/develop' into travis/room-list/sublist-badges 2020-06-09 08:06:10 -06:00
Travis Ralston
8632d56e97 dispose -> destroy 2020-06-09 08:05:35 -06:00
Travis Ralston
182dd41947
Merge pull request #4736 from matrix-org/travis/room-list/filter-explore 
Add filtering and exploring to the new room list
 2020-06-09 07:59:13 -06:00
Travis Ralston
ae8b75214a Balance out the throttle 2020-06-09 07:58:39 -06:00
Jorik Schellekens
9b623f5b44 fix line indents 2020-06-09 13:38:29 +01:00
Jorik Schellekens
7a3ed0e496
Merge pull request #4733 from matrix-org/joriks/font-scaling-appearance 
Clean up font scaling appearance
 2020-06-09 13:16:15 +01:00
Travis Ralston
5114c37b82 Add filtering and exploring to the new room list 
This is per the designs. Animation doesn't feel required here.

Like the rest of this series, this rewrites a component to be more purpose-built to help match the designs and to solve the smallest possible problem.
 2020-06-08 20:33:21 -06:00
Travis Ralston
9859891b4d Merge branch 'develop' into travis/room-list/sublist-badges 2020-06-08 18:12:43 -06:00
Travis Ralston
bcc455b248 Merge branch 'develop' into travis/room-list/breadcrumbs 2020-06-08 18:11:42 -06:00
Travis Ralston
0354bf9b6d Reimplement breadcrumbs for new room list 
This all-new component handles breadcrumbs a bit more smoothly for the app by always listening to changes even if the component isn't present. This allows the breadcrumbs to remain up to date for when the user re-enables breadcrumbs.

The new behaviour is that we turn breadcrumbs on once the user has a room, and we don't turn it back off for them.

This also introduces a new animation which is more stable and not laggy, though instead of sliding the breadcrumbs pop. This might be undesirable - to be reviewed.
 2020-06-08 17:11:58 -06:00
Travis Ralston
086b9101fa Add sublist badge counts to new room list 
Also add IDLE state to rooms
 2020-06-08 13:42:18 -06:00
Jorik Schellekens
b4bdb23f5f Clean up font scaling appearance 2020-06-08 19:02:36 +01:00
Jorik Schellekens
24cf3d5f05 add key to react list and let selector container wrap 2020-06-08 18:37:36 +01:00
Jorik Schellekens
a10e71edcf Use styled radio buttons for theme selection 2020-06-08 18:17:02 +01:00
Travis Ralston
de4c2fe3d9 Use real buttons in user menu 2020-06-08 11:06:21 -06:00
Jorik Schellekens
d6a532040e lint 2020-06-08 16:57:39 +01:00
Jorik Schellekens
26eaef848b Use Element instead of HTMLElement 2020-06-08 16:53:19 +01:00
Jorik Schellekens
35ecaff399 Move Settings flag to ts 2020-06-08 16:48:32 +01:00
Travis Ralston
6002fef269 Merge branch 'travis/room-list/css-layout' into travis/room-list/user-menu 2020-06-08 09:41:38 -06:00
Travis Ralston
000c92a53f Merge branch 'develop' into travis/room-list/css-layout 2020-06-08 09:40:21 -06:00
Travis Ralston
50673496c3 Add hosting link 2020-06-08 09:32:16 -06:00
Travis Ralston
94ce23aa4b Wire up theme changer 2020-06-08 09:32:05 -06:00
Travis Ralston
acf78ae475 Wire up the remaining dialogs 2020-06-08 09:04:43 -06:00
Travis Ralston
de18af35ff Support minimum to open user settings to a particular tab 
Tabs now have IDs, and we use those IDs to open things. This doesn't do any conversion to typescript, and doesn't add the same feature to the room settings out of concern for the size of diff.
 2020-06-08 08:20:15 -06:00
Jorik Schellekens
a7bc722b3f Use px where images use px width 2020-06-08 14:45:12 +01:00
Jorik Schellekens
2fe7c37566 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/font-scaling-unit-change 2020-06-08 13:37:05 +01:00
Travis Ralston
f05a1e532b Point buttons at the right functions 2020-06-07 22:17:02 -06:00
Travis Ralston
8e0247afe5 Add most of the UI for the new room list's menu button 
Incomplete implementation: buttons don't work, some text is missing, etc
 2020-06-07 22:06:41 -06:00
Travis Ralston
bb3cdd3335 Merge branch 'travis/room-list/css-layout' into travis/room-list/user-menu 2020-06-07 20:24:10 -06:00
Travis Ralston
e4aeabe5a6
Merge pull request #4444 from pv/jitsi-popout-immediate-join 
Ensure active Jitsi conference is closed on widget pop-out
 2020-06-07 20:22:39 -06:00
Travis Ralston
2806c8c18b Fix temporary class 2020-06-05 14:13:28 -06:00
Travis Ralston
1d8833e9f8 Selected state, cleanup, and profile display 2020-06-05 14:08:20 -06:00
Travis Ralston
ea6b0a60ab Merge branch 'develop' into travis/room-list/css-layout 2020-06-05 13:19:00 -06:00
Travis Ralston
ee3d2c51d8
Merge pull request #4697 from matrix-org/travis/room-list/scrolling-resize 
New room list scrolling and resizing
 2020-06-05 13:17:59 -06:00
Travis Ralston
e93a41c5fb Minor clarity 2020-06-05 13:14:44 -06:00
Travis Ralston
68e59a3655
Merge pull request #4696 from aaronraimist/empty-formatbar 
Don't show FormatBar if composer is empty
 2020-06-05 11:27:00 -06:00
David Baker
ed7f0fd95f This promise doesn't exist anymore 2020-06-05 18:08:25 +01:00
Travis Ralston
51038b0c02 Replace math hacks with temporary placeholder 2020-06-05 11:03:18 -06:00
David Baker
7c59e39710 Sort out what we wait for after login 
We were waiting only for the client to become logged in rather than
for setLoggedIn() to finish but then we were waiting for the first
sync to complete which is far longer. We need setLoggedIn to have
finished for crypto to be set up so we can query cross-signing keys,
so just wait for that anyway, the logic becomes a lot simpler and
we're waiting the same amount of time because we have to wait for
the first sync to finish. We can also download keys in parallel.
 2020-06-05 17:52:09 +01:00
David Baker
68e555a0c6 Support accounts with cross signing but no SSSS 
At least at the login stage.

Fixes https://github.com/vector-im/riot-web/issues/13894
 2020-06-05 16:40:20 +01:00
David Baker
b82a893a79 Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases 2020-06-05 16:00:43 +01:00
Travis Ralston
475ba61671 Give the show more button some real CSS 
This is still somewhat placeholder.
 2020-06-05 08:48:23 -06:00
Travis Ralston
6752c2832e Add missing var 2020-06-05 08:40:32 -06:00
Travis Ralston
b31a8d494b Merge branch 'travis/room-list/scrolling-resize' into travis/room-list/css-layout 2020-06-05 08:39:19 -06:00
Travis Ralston
1f11298aa3 Annotate hacky math 2020-06-04 21:45:32 -06:00
Travis Ralston
e90e70bd77 Misc cleanup 2020-06-04 21:43:33 -06:00
Travis Ralston
0694637b06 Remove debug 2020-06-04 21:38:06 -06:00
Travis Ralston
f347019cf8 Remove obviously questionable color choices 2020-06-04 21:37:10 -06:00
Travis Ralston
0c15b2bdb6 Simple structuring of the room list itself 
This covers the larger parts of the design, but doesn't deal with the nuances of hover states, badge sizing, etc.
 2020-06-04 21:21:04 -06:00
Travis Ralston
4c1bc50649 Initial styling for new room list 
This is a work in progress, but covers the coarse areas. This uses all-new classes to better describe what everything is, and to reduce the number of selectors we keep track of.

This is primarily layout for the list and not actually the final structure. For example, some buttons are missing and other areas are not styled correctly - the idea in this commit was to get things roughly in the right place and work on it.
 2020-06-04 16:41:18 -06:00
Travis Ralston
02c131e3ff Merge branch 'travis/room-list/scrolling-resize' into travis/room-list/css-layout 2020-06-04 16:40:55 -06:00
Travis Ralston
434f6ea4d4 Remove legacy sublist sizing 2020-06-04 16:36:14 -06:00
Travis Ralston
dc01607ad9 Merge branch 'develop' into travis/split-left-panel 2020-06-04 15:09:51 -06:00
Jorik Schellekens
bba6767608 Update displayed min and max 2020-06-04 18:00:22 +01:00
David Baker
5e569d75b6 Fix exceptions from Tooltip 
renderTooltip was not a bound function and so was failing to find
the parent when called from the 'scroll' event listener because
'this' was the window object rather than the Tooltip object.

Unsure at what point this broke - I assumed it was in thr recent
typescript conversion but it looks like it would have had the same
problem before.
 2020-06-04 17:54:18 +01:00
Jorik Schellekens
2ec47ecc74 Use different setting flag print expected values 2020-06-04 17:50:56 +01:00
Tulir Asokan
46b282142f
Stop removing variation selector from quick reactions 
Fixes vector-im/riot-web#13926

Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2020-06-04 18:58:13 +03:00
Travis Ralston
a3fdd643d7 Add hacky math support 2020-06-04 09:57:16 -06:00
Travis Ralston
cdf2d70aea Merge branch 'develop' into travis/room-list/scrolling-resize 2020-06-04 09:19:54 -06:00
Travis Ralston
83df79aab9 Try variable resizing 2020-06-04 09:19:03 -06:00
Damir Jelić
e94f3422df Searching: Add support to paginate Seshat search results. 2020-06-04 17:06:58 +02:00
Michael Telatynski
920e087ada
Merge pull request #4704 from matrix-org/t3chguy/continuation 
Tidy up continuation algorithm and make it work for hidden profile changes
 2020-06-04 13:59:13 +01:00
Michael Telatynski
4043989a25
Merge pull request #4699 from matrix-org/t3chguy/fix-own-displayname 
Profile settings should never show a disambiguated display name
 2020-06-04 13:50:15 +01:00
Michael Telatynski
6d81337d92 Tidy up continuation algorithm and make it work for hidden profile change events 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-04 13:10:45 +01:00
Bruno Windels
07e0cab4a8 When trying to restore a keyback that has its key in 4S, check if 4S will be readable 
If the account data for the 4S key is cleared or lost somehow, don't attempt to
read the key and ask for the passphrase/recovery key instead, as doing so would trigger another
bootstrap from the restore key backup dialog, overwriting the existing key backup.
 2020-06-04 12:52:20 +02:00
Michael Telatynski
993a545cd2 Profile settings should never show a disambiguated display name 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-04 09:50:19 +01:00
Travis Ralston
30027a6556 Remove debugging 2020-06-03 21:53:58 -06:00
Travis Ralston
be4f75bca9 Add a 'show more' button to room lists 2020-06-03 21:53:08 -06:00
Travis Ralston
dbf996439b Wedge t3chguy's resizer prototype into the sublist 2020-06-03 21:17:51 -06:00
Travis Ralston
c07b5ebe9a Initial experiments with resizing of room lists 2020-06-03 21:17:18 -06:00
Michael Telatynski
bde327e1e6
Merge pull request #4695 from aaronraimist/center-headerbuttons 
Center HeaderButtons
 2020-06-04 00:36:23 +01:00
Aaron Raimist
ed2eca52b2
Don't show FormatBar if composer is empty 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-06-03 18:05:43 -05:00
Aaron Raimist
a4c9a67325 Delete files.png and change UploadConfirmDialog to use svg used elsewhere 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-06-03 17:23:37 -05:00
Michael Telatynski
eccacb1bc7
Merge pull request #4605 from matrix-org/t3chguy/e2eedefault 
Add .well-known option to control default e2ee behaviour
 2020-06-03 22:12:13 +01:00
Michael Telatynski
10bdb4975e
Merge pull request #4685 from matrix-org/t3chguy/sso-query 
Fix login loop where the sso flow returns to `#/login`
 2020-06-03 20:28:01 +01:00
Michael Telatynski
5b775fd63c
Merge pull request #4690 from matrix-org/t3chguy/mau-toasts 
Don't clear MAU toasts when a successful sync comes in
 2020-06-03 20:23:25 +01:00
Michael Telatynski
899f9ede45 change names of consts for clarity 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-03 20:23:01 +01:00
Travis Ralston
380ba163e4
Merge pull request #4681 from matrix-org/travis/room-list/filtering 
Add initial filtering support to new room list
 2020-06-03 13:21:13 -06:00
Michael Telatynski
5a4723d243 don't specify hs_disabled as its a Synapse special 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-03 20:13:32 +01:00
Travis Ralston
013751e308
Merge pull request #4664 from matrix-org/foldleft/13523-hide-empty-verifications 
Bubble up a decline-to-render of verification events to outside wrapper
 2020-06-03 10:10:06 -06:00
Michael Telatynski
9c417cfbad Don't clear MAU toasts when a successful sync comes in 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-03 16:17:31 +01:00
Michael Telatynski
030cc5cdea
Merge pull request #4666 from matrix-org/t3chguy/image-view-focuslock 
Apply FocusLock to ImageView to capture Escape handling
 2020-06-03 15:37:18 +01:00
David Baker
ddcd3fb806 Fix the 'complete security' screen 
https://github.com/matrix-org/matrix-react-sdk/pull/4655 removed
the check for cross-signing account data where the cross-signing
labs flag was enabled if you had an existing cross-signing setup.
This also sent the user to the 'complete security' view rather than
the 'E2E Setup' view though, which meant new logins should always
see the E2E setup screen (ie. be prompted to upgrade encryption).

NB. We need to change this check for SSSS keys in account data
(https://github.com/vector-im/riot-web/issues/13894) but we should
put this back the way it was in the meantime.

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4655
 2020-06-03 14:31:34 +01:00
David Baker
6f3bfc96ca Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases 2020-06-03 11:01:43 +01:00
Michael Telatynski
6d11b4f99b
Merge pull request #4688 from matrix-org/t3chguy/autocomplete-scrollintoview 
add null-guard for Autocomplete containerRef
 2020-06-03 10:59:14 +01:00
Michael Telatynski
eb536ff2f7 Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault 
 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.js
	src/components/views/dialogs/InviteDialog.js
	src/components/views/right_panel/UserInfo.js
	src/createRoom.js
 2020-06-03 10:51:17 +01:00
Michael Telatynski
936445ab2d
Merge pull request #4660 from matrix-org/t3chguy/kill_UDE_and_UDD 
Remove legacy codepaths for Unknown Device Error (UDE/UDD) handling
 2020-06-03 10:45:47 +01:00
Michael Telatynski
653b2ff060
Merge pull request #4655 from matrix-org/t3chguy/remove_cross_signing 
Remove feature_cross_signing
 2020-06-03 10:42:13 +01:00
Michael Telatynski
b120488857 add null-guard for Autocomplete containerRef 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-03 10:39:28 +01:00
Michael Telatynski
7cfeda96d0
Merge pull request #4670 from matrix-org/t3chguy/autocomplete-scrollintoview 
Autocomplete: use scrollIntoView for auto-scroll to fix it
 2020-06-03 09:55:00 +01:00