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

11167 commits

Author SHA1 Message Date
Travis Ralston
8201eed929 Encourage counts if the user has a mention (red state) 2020-06-22 10:26:37 -06:00
Travis Ralston
eeb408a081 Update badge logic for new setting and behaviour 
For https://github.com/vector-im/riot-web/issues/14084
 2020-06-22 10:26:19 -06:00
Jorik Schellekens
d54676aefe Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/appearance-advanced 2020-06-22 15:35:48 +01:00
Jorik Schellekens
aab42a291b implement appearance tab nits 
- fix border colours in dark theme
- lighten dark theme preview background
- add missing return statement
 2020-06-22 12:28:15 +01:00
Jorik Schellekens
086177d808
Merge pull request #4770 from matrix-org/joriks/font-scaling-message-preview 
Add message preview for font slider
 2020-06-22 11:43:52 +01:00
Jorik Schellekens
3d7427ccca Fix semicolons 2020-06-22 11:39:11 +01:00
Jorik Schellekens
2294d23b32
Merge branch 'develop' into joriks/appearance-advanced 2020-06-22 11:27:48 +01:00
David Baker
ee6af6ae9e Merge remote-tracking branch 'origin/develop' into dbkr/support_no_ssss 2020-06-19 17:17:18 +01:00
David Baker
a1592704a2 Unused code & import 2020-06-19 17:17:04 +01:00
David Baker
3f936a1fe4 Merge remote-tracking branch 'origin/develop' into dbkr/support_no_ssss 2020-06-19 16:50:29 +01:00
Damir Jelić
ec4b350a82 Merge remote-tracking branch 'origin/poljar/seshat-search-pagination' into develop 2020-06-19 09:50:03 +02:00
Hubert Chathi
c690cfc6c5 mark messages with a black shield if the megolm session isn't trusted 2020-06-18 21:57:33 -04:00
Travis Ralston
f136ba4a98
Merge pull request #4796 from matrix-org/travis/room-list/bug/crash-filter 
Fix crash when filtering new room list too fast
 2020-06-18 16:53:42 -06:00
Travis Ralston
7191c01265 Fix crash when filtering new room list too fast 
Fixes https://github.com/vector-im/riot-web/issues/14092

We were simply assuming we had a reference to a notification state, which might not be the case if we're between renders.
 2020-06-18 15:52:55 -06:00
Michael Telatynski
eec42cff49 tidy up 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-18 22:49:39 +01:00
Michael Telatynski
045def4566 hide search results from unknown rooms 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-18 22:45:42 +01:00
Jorik Schellekens
37b299412f Fix merge conflicts 2020-06-18 15:47:26 +01:00
Jorik Schellekens
f2440388b1 Merge branch 'joriks/font-scaling-message-preview' into joriks/appearance-tab-layout-options 2020-06-18 15:37:01 +01:00
Jorik Schellekens
b9fb9aae4a Rename MessagePreview to EventTilePreview 2020-06-18 15:36:23 +01:00
Jorik Schellekens
0d3ea6c9d4 Merge branch 'joriks/font-scaling-message-preview' of github.com:matrix-org/matrix-react-sdk into joriks/font-scaling-message-preview 2020-06-18 15:34:03 +01:00
Jorik Schellekens
997c7ffc96 Add missing semicolons 2020-06-18 15:26:53 +01:00
Jorik Schellekens
15881fc7d0
Merge branch 'develop' into joriks/font-scaling-message-preview 2020-06-18 15:19:28 +01:00
Jorik Schellekens
adfe1ac9bf Remove stray debug 2020-06-18 15:13:28 +01:00
David Baker
e4d824839a Revert "Use recovery keys over passphrases" 2020-06-18 15:02:03 +01:00
Jorik Schellekens
291997421b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/semicolon 2020-06-18 14:54:20 +01:00
Jorik Schellekens
74174041bb Remove semicolon in style 2020-06-18 14:53:12 +01:00
David Baker
5b27a570a8
Merge pull request #4790 from matrix-org/revert-4686-dbkr/recovery_keys_over_passphrases 
Revert "Use recovery keys over passphrases"
 2020-06-18 14:51:22 +01:00
Travis Ralston
c26513b1e3
Merge pull request #4783 from matrix-org/travis/room-list/sticky-headers-reliability 
Clear `top` when not sticking headers to the top
 2020-06-18 07:48:46 -06:00
Travis Ralston
8f3a6fc30e
Consistent quotes 2020-06-18 07:48:36 -06:00
Travis Ralston
4a5cc8557c
Merge pull request #4785 from matrix-org/travis/room-list/show-less-is-more 
Don't show a 'show less' button when it's impossible to collapse
 2020-06-18 07:46:32 -06:00
Travis Ralston
b857c9d199
Merge pull request #4786 from matrix-org/travis/room-list/show-n-reliability 
Fix show less/more button occluding the list automatically
 2020-06-18 07:46:13 -06:00
Jorik Schellekens
47a825be7c
Merge branch 'develop' into joriks/appearance-advanced 2020-06-18 14:41:28 +01:00
Jorik Schellekens
05d0309081 Lint a few semicolons 2020-06-18 14:32:43 +01:00
Jorik Schellekens
9760f94ff5 Merge branch 'joriks/font-scaling-message-preview' into joriks/appearance-tab-layout-options 2020-06-18 14:04:31 +01:00
Jorik Schellekens
69969dfee8 Respond to review 
- remove all refs to getsdk
- i18n
- some lints
 2020-06-18 13:58:35 +01:00
Jorik Schellekens
a579ea95db Lint and i18n 2020-06-18 13:28:24 +01:00
David Baker
54e235b0b9 Remove labs option to cache 'passphrase' 
(which actually meant SSSS secrets)

Fixes https://github.com/vector-im/riot-web/issues/1392
 2020-06-18 10:42:33 +01:00
David Baker
e0a34d9dea
Revert "Use recovery keys over passphrases" 2020-06-18 09:35:11 +01:00
Travis Ralston
245181cf80 Fix show less/more button occluding the list automatically 
When the user would click 'show more' they would be presented with a 'show less' button that occluded the last room. 

Similarly, if they resized the list so that all their rooms would be shown and refreshed the page, they would find their last room covered by the button.

This changes the handling so that showAllClick() sets the height to numTiles + button padding, and adjusts the height calculations on render to deal with relative tiles.

This also removes the conditional padding of the resize handle, as we always occupy the 4px of space. It was leading to rooms getting trimmed slightly by the show N button.
 2020-06-17 22:09:59 -06:00
Travis Ralston
1735da8cb1 Don't show a 'show less' button when it's impossible to collapse 
Fixes https://github.com/vector-im/riot-web/issues/14076
 2020-06-17 22:04:34 -06:00
Travis Ralston
321889f95b Clear top when not sticking headers to the top 
Fixes https://github.com/vector-im/riot-web/issues/14070
 2020-06-17 20:01:03 -06:00
Travis Ralston
58671f014b
Merge pull request #4765 from matrix-org/travis/room-list/show-less 
Add a 'show less' button to the new room list
 2020-06-17 10:24:50 -06:00
Travis Ralston
d2831ffb0c
Merge pull request #4758 from matrix-org/travis/room-list/sticky 
Sticky and collapsing headers for new room list
 2020-06-17 08:28:38 -06:00
Jorik Schellekens
2fcf30c1ec
Fix copy '!' 2020-06-17 14:39:44 +01:00
Michael Telatynski
f08efc632f
Merge pull request #4777 from matrix-org/t3chguy/notifications0 
Improve Field ts definitions some more
 2020-06-17 02:21:47 +01:00
Michael Telatynski
3dcf525382 Improve Field ts definitions some more 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-17 02:14:20 +01:00
Michael Telatynski
9a85b82007
Merge pull request #4775 from matrix-org/t3chguy/notifications0 
Fix Field ts def, fix LocalEchoWrapper and NotificationsEnabledController
 2020-06-17 01:14:54 +01:00
Michael Telatynski
b225324c49 improve Field typescript definition 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-17 01:05:10 +01:00
Travis Ralston
9878c1dc34 and another 2020-06-16 17:42:26 -06:00
Travis Ralston
7a71ef9b6b Fix another space 2020-06-16 17:40:25 -06:00
Travis Ralston
daa552e250 Refactor listener usage 2020-06-16 17:35:56 -06:00
Travis Ralston
b69a5a525d Fix spaces 2020-06-16 17:29:36 -06:00
Travis Ralston
e4a51a7c01 Add presence icons; Convert to generic icon component 
For https://github.com/vector-im/riot-web/issues/14039
 2020-06-16 14:44:37 -06:00
Travis Ralston
bcebef7e56 Add a globe icon to public rooms 
For https://github.com/vector-im/riot-web/issues/14039
 2020-06-16 12:13:12 -06:00
Jorik Schellekens
2192332968 Add layout options to the appearance tab 2020-06-16 17:55:19 +01:00
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
Travis Ralston
6d96d66c03 Split the left panel into new and old for new room list designs 
Though we consider the "room list" to mean the RoomList component specifically, the room list is actually the entire left panel as far as the user is concerned. 

The new proposed designs for the room list modify the whole left panel, so we had might as well break it into new and old now instead of later. This "new" left panel is a bare-bones implementation and meant to only provide the absolute basic feature set to function for those who enable the experimental room list, for whatever reason. This is not intended to be a final implementation, or even remotely close to what it could be. An example of this is the lack of breadcrumbs. Given they are likely to change, they are excluded from this temporary skeleton completely.

This also includes a purple/pink bar between the tag panel and left panel. This is so we can, if needed, differentiate between people who made the mistake of turning on the experimental room list while the overall aesthetic makes it indistinguishable. Once the designs are moderately approved, we can (and definitely should) remove the hideous indicator.
 2020-06-02 19:26:07 -06:00
Travis Ralston
1f1f613777 Add a focus_composer dispatcher action 
and use it
 2020-06-02 19:07:46 -06:00
Michael Telatynski
d99babfe05 Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault 2020-06-02 21:51:05 +01:00
David Baker
b83ecb1781 Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases 2020-06-02 18:53:54 +01:00
David Baker
0046e204a0 Make the continue button actually work 2020-06-02 18:30:37 +01:00
David Baker
5624cf5ceb Add option to reset keys to the encryption setup screen 2020-06-02 17:55:27 +01:00
David Baker
e06ba2003b Prompt for recovery key on login rather than passphrase 
Only show passphrase options at all if the user has a passphrase on
their SSSS key.
 2020-06-02 16:32:15 +01:00
Michael Telatynski
113a9d71b5 Fix login loop where the sso flow returns to #/login 
due to fragmentAfterLogin going back to `#/login`
and https://github.com/vector-im/riot-web/issues/11643

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-02 16:26:07 +01:00
Michael Telatynski
3fbfb62bc9 Merge branches 'develop' and 't3chguy/emoji_picker_composer' of github.com:matrix-org/matrix-react-sdk into t3chguy/emoji_picker_composer 2020-06-02 14:00:37 +01:00
Michael Telatynski
3020e395c1 iterate PR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-02 13:48:08 +01:00
J. Ryan Stinnett
0717c7749e
Merge pull request #4347 from MTRNord/fix-register-auth-with-new-spec 
Make auth argument in the register request compliant with r0.6.0
 2020-06-02 10:14:09 +01:00
Travis Ralston
613b994f9d
Revert "Prevent PersistedElements overflowing scrolled areas" 2020-06-02 00:21:31 -06:00
Travis Ralston
73a8e77d32 Add initial filtering support to new room list 
For https://github.com/vector-im/riot-web/issues/13635

This is an incomplete implementation and is mostly dumped in this state for review purposes. The remainder of the features/bugs are expected to be in more bite-sized chunks.

This exposes the RoomListStore on the window for easy access to things like the new filter functions (used in debugging).

This also adds initial handling of "new rooms" to the client, though the support is poor.

Known bugs:
* [ ] Regenerates the entire room list when a new room is seen.
* [ ] Doesn't handle 2+ filters at the same time very well (see gif. will need a priority/ordering of some sort).
* [ ] Doesn't handle room order changes within a tag yet, despite the docs implying it does.
 2020-06-01 16:49:22 -06:00
Michael Telatynski
5025de5525 Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault 2020-06-01 23:28:21 +01:00
Michael Telatynski
2dda93bf1a delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-01 23:09:57 +01:00
Michael Telatynski
702bbe3bcd Add e2ee-default:false notice to Setting>Security 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-01 23:09:14 +01:00
Michael Telatynski
a2fb96eb8f Update Create Room Dialog microcopy for e2ee-default:false 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-01 22:59:14 +01:00
Travis Ralston
5b6118dad4 Remove the unused GroupsButton too 2020-06-01 15:39:22 -06:00
Travis Ralston
ad617f9e3a Remove unused TagPanelButtons 
This isn't used, and is just confusing. The feedback dialog is still used by the top left menu.
 2020-06-01 15:35:08 -06:00
Jorik Schellekens
c66a277409
Merge pull request #4679 from JorikSchellekens/joriks/fix-irc-resize-save 
Pass roomId to IRCTimelineProfileResizer
 2020-06-01 22:00:51 +01:00
Michael Telatynski
8848a2ea64 Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault 
 Conflicts:
	src/components/views/dialogs/InviteDialog.js
 2020-06-01 21:42:31 +01:00
Jorik Schellekens
5bba62c28b Pass roomId to IRCTimelineProfileResizer 2020-06-01 18:27:10 +01:00
Jorik Schellekens
5caae2051b
Merge pull request #4678 from JorikSchellekens/joriks/draggable-cleanup-console 
Remove logging to console for irc name resize
 2020-06-01 18:22:23 +01:00
Jorik Schellekens
85faa8ac23
Merge pull request #4677 from JorikSchellekens/joriks/fix-dark-theme-selection 
Use arrow functions instead of binding `this`
 2020-06-01 18:12:05 +01:00
Jorik Schellekens
6801751745 No logging 2020-06-01 18:08:52 +01:00
Jorik Schellekens
7db95b614a Revert to arrow functions to bind this 2020-06-01 18:01:12 +01:00
Jorik Schellekens
8fea9e831e
Merge pull request #4665 from JorikSchellekens/joriks/appearance-tab 
Create and use stylised checkboxes
 2020-06-01 17:58:03 +01:00
Jorik Schellekens
c1adee376f
Merge pull request #4676 from JorikSchellekens/joriks/fix-irc-resizer 
useIRCLayout moved to props
 2020-06-01 17:57:43 +01:00
Jorik Schellekens
df18638164 useIRCLayout moved to props 2020-06-01 17:34:42 +01:00
Jorik Schellekens
53129cafc7 Move comment 2020-06-01 15:36:55 +01:00
Jorik Schellekens
fb9b14ec51 Remove superflous list 2020-06-01 15:35:25 +01:00
Michael Telatynski
7b2f2daf2c Upload and Paste to Upload tweaks 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-01 15:00:55 +01:00
Jorik Schellekens
69747b6114 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/appearance-tab 2020-06-01 14:32:31 +01:00
Jorik Schellekens
9e9bcb4974 Move id generator into constrcutor 2020-06-01 12:04:47 +01:00
Jorik Schellekens
419857c29c
Merge pull request #4647 from JorikSchellekens/joriks/fix-filepanel-regression 
Fix FilePanel and NotificationsPanel regression
 2020-05-31 21:17:14 +01:00
Michael Telatynski
66a945b26c Merge branches 'develop' and 't3chguy/autocomplete-scrollintoview' of github.com:matrix-org/matrix-react-sdk into t3chguy/autocomplete-scrollintoview 2020-05-30 13:41:00 +01:00
Michael Telatynski
bc83984a62 tidy up the ref to ref with a forwardRef and initialComponent signature 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-30 13:30:59 +01:00
Michael Telatynski
6472ca451e
Merge pull request #4669 from matrix-org/t3chguy/toasts6_1 
Allow deferring of Update Toast until the next morning
 2020-05-30 12:54:42 +01:00
Michael Telatynski
097f27c822
Merge pull request #4668 from matrix-org/t3chguy/toasts6 
Give contextual feedback for manual update check instead of banner
 2020-05-30 12:46:53 +01:00
Michael Telatynski
8087b521e6 Autocomplete: use scrollIntoView for auto-scroll instead of broken manual scrollTop calculation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-29 21:42:33 +01:00
Michael Telatynski
3f76b73b50
Merge pull request #4659 from matrix-org/t3chguy/dialog_cancel_space 
Dialog wrap title instead of taking same space as the close/cancel button
 2020-05-29 20:47:31 +01:00
Michael Telatynski
0b44e30517
Merge pull request #4627 from matrix-org/t3chguy/modular-utm 
Update Modular hosting link
 2020-05-29 20:16:13 +01:00
Michael Telatynski
9431393bda Allow deferring of Update Toast until the next morning 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-29 19:59:47 +01:00
Jorik Schellekens
b61f1704d3
Merge branch 'develop' into joriks/fix-filepanel-regression 2020-05-29 19:14:19 +01:00
Michael Telatynski
f45c584c8a Correct the GenericToast props to show the two modes of operation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-29 19:13:59 +01:00
Michael Telatynski
efd0da44a1 Give contextual feedback for manual update check instead of banner 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-29 18:24:45 +01:00
Travis Ralston
822a126cb6
Merge pull request #4663 from JorikSchellekens/develop 
Fix field placeholder regression
 2020-05-29 10:47:04 -06:00
Travis Ralston
ea064afca4 Fix/document a number of UIA oddities 
Edition 2 of https://github.com/matrix-org/matrix-react-sdk/pull/3211
Fixes https://github.com/vector-im/riot-web/issues/13837
 2020-05-29 08:23:59 -06:00
Michael Telatynski
f40cfe4a3b Implement new design with new iconography 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-29 15:00:27 +01:00
Michael Telatynski
ccd0c952e3 Merge branches 'develop' and 't3chguy/emoji_picker_composer' of github.com:matrix-org/matrix-react-sdk into t3chguy/emoji_picker_composer 
 Conflicts:
	src/components/views/rooms/MessageComposer.js
 2020-05-29 14:53:42 +01:00
Michael Telatynski
d02a18bfff Apply FocusLock to ImageView to capture Escape handling 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-29 01:44:09 +01:00
Jorik Schellekens
66c0d53f3e Create and use stylised checkboxes 2020-05-28 22:33:00 +01:00
Zoe
472c421150 Bubble up a decline-to-render of verification events to outside wrapper 
This stops the event from appearing as a blank line.
 2020-05-28 21:41:31 +01:00
Jorik Schellekens
6559fd499e Fix field placeholder regression 2020-05-28 21:09:42 +01:00
Michael Telatynski
2530ec8419 Try and fix the Notifier race 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-28 19:03:42 +01:00
Michael Telatynski
0242b6f3f3
Merge pull request #4624 from matrix-org/t3chguy/toasts3_2 
Migrate Banners to Toasts
 2020-05-28 18:21:28 +01:00
Michael Telatynski
8aaa7825ef Also kill off things that these kept behind 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-28 17:12:19 +01:00
Michael Telatynski
f0cabd55c0 Remove legacy codepaths for Unknown Device Error (UDE/UDD) handling 
as we now always `setGlobalErrorOnUnknownDevices(false)`

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-28 17:01:22 +01:00
Michael Telatynski
03058bacbd Dialog wrap title instead of taking same space as the close/cancel button 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-28 16:48:50 +01:00
Jorik Schellekens
9034889414 Reorder interfaces 2020-05-28 14:43:01 +01:00
Jorik Schellekens
81922231ed Move Appearance tab to ts 2020-05-28 13:55:07 +01:00
Travis Ralston
9e2d80b8c8 Update documentation and auth dict submissions 2020-05-27 13:16:49 -06:00
Travis Ralston
81cae66732 Merge branch 'develop' into fix-register-auth-with-new-spec 2020-05-27 12:02:46 -06:00
Michael Telatynski
0fd5714e21
Merge pull request #4606 from matrix-org/t3chguy/peeking-races 
Fix room alias lookup vs peeking race condition
 2020-05-27 17:07:12 +01:00
Jorik Schellekens
46134f5368
Merge pull request #4651 from JorikSchellekens/joriks/fix-encryption-icons-irc 
Fix encryption icon miss-alignment
 2020-05-27 17:05:32 +01:00
Michael Telatynski
48de174576 remove debug 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 12:20:20 +01:00
Michael Telatynski
efa47f1a8e Change out debug 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 12:02:51 +01:00
Michael Telatynski
cc68f53fc2 tidy up and delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 10:47:01 +01:00
Michael Telatynski
2b432b0d82 Remove feature_cross_signing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 10:28:25 +01:00
David Baker
8bac26c5e3
Merge pull request #4648 from matrix-org/dbkr/remove_keyshare_dialog 
Remove the keyshare dialog
 2020-05-27 10:24:33 +01:00
Michael Telatynski
c492ae97fd Merge branches 'develop' and 't3chguy/toasts3_2' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3_2 2020-05-27 09:45:38 +01:00
Travis Ralston
8370fa8bb4 Event.decrypted from the client 2020-05-26 19:56:56 -06:00
Travis Ralston
bf8a3d4419 Bind to the room instead of the client 
Also add the other missing deregister handlers
 2020-05-26 16:20:51 -06:00
Travis Ralston
a9c54153ee Update badge counts in new room list as needed 2020-05-26 14:16:33 -06:00
Jorik Schellekens
73213422a9 fix encryption icon missalignment 2020-05-26 18:15:06 +01:00
David Baker
a496dafd41 Remove the keyshare dialog 
Fixes https://github.com/vector-im/riot-web/issues/11908
 2020-05-26 16:51:20 +01:00
Jorik Schellekens
076a3e058d
Merge pull request #4635 from JorikSchellekens/joriks/field-ts 
Move Field to Typescript
 2020-05-26 16:13:03 +01:00
Jorik Schellekens
fcbd197e7d Fix file list regression 2020-05-26 15:56:16 +01:00
David Baker
e5c4d6fdcd
Merge pull request #4644 from matrix-org/dbkr/kill_encryptedeventdialog 
Remove EncryptedEventDialog
 2020-05-26 13:55:02 +01:00
Michael Telatynski
b7428fcf35
Merge pull request #4618 from matrix-org/t3chguy/toasts3 
Migrate Toasts to Typescript and to granular priority system
 2020-05-26 13:48:47 +01:00
David Baker
d2fe4bcecd Unused imports 2020-05-26 13:46:47 +01:00
Michael Telatynski
0cec16d3b1
Merge pull request #4632 from matrix-org/t3chguy/confusing_copy 
Update Crypto Store Too New copy
 2020-05-26 13:45:40 +01:00
Michael Telatynski
d1084afb92
Merge pull request #4643 from matrix-org/t3chguy/fix-memberavatar 
MemberAvatar should not have its own letter fallback, it should use BaseAvatar
 2020-05-26 13:41:15 +01:00
Michael Telatynski
c74d890774 Merge branches 'develop' and 't3chguy/toasts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3 
 Conflicts:
	src/@types/global.d.ts
	src/components/structures/ToastContainer.tsx
 2020-05-26 13:38:17 +01:00
David Baker
7e45a71a8a Remove EncryptedEventDialog 
https://github.com/matrix-org/matrix-react-sdk/pull/4412 disabled it
when cross signing was enabled so it is essentially gone now anyway.

Fixes https://github.com/vector-im/riot-web/issues/11752
 2020-05-26 13:37:57 +01:00
Michael Telatynski
0713139dc5 Merge branches 'develop' and 't3chguy/confusing_copy' of github.com:matrix-org/matrix-react-sdk into t3chguy/confusing_copy 2020-05-26 13:35:18 +01:00
Michael Telatynski
f8d2124aa3 MemberAvatar should not have its own letter fallback, it should use BaseAvatar's 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-26 13:33:47 +01:00
Jorik Schellekens
ba3fe850e0 Implement review 
- lint member order
- cleaner type coersion
- specify access modifiers everywhere
 2020-05-26 12:09:23 +01:00
Michael Telatynski
a64de63f00
Merge pull request #4633 from matrix-org/t3chguy/group-view-guest 
fix viewGroup to actually show the group if possible
 2020-05-26 12:03:52 +01:00
Michael Telatynski
e049ead25f
Merge pull request #4636 from matrix-org/t3chguy/emojipickera11y 
Improve accessibility of the emoji picker
 2020-05-26 12:02:07 +01:00
Michael Telatynski
c00fd326c5
Merge pull request #4613 from matrix-org/t3chguy/toasts1 
Improve style of toasts to match Figma
 2020-05-26 11:59:58 +01:00
Michael Telatynski
47af85b7b9
Merge pull request #4628 from matrix-org/t3chguy/message_sent 
Fix sentMessageAndIsAlone by dispatching `message_sent` more consistently
 2020-05-26 11:58:14 +01:00
Michael Telatynski
707e22ad09
Merge pull request #4402 from matrix-org/t3chguy/alias 
Replace `alias` with `address` in copy for consistency
 2020-05-26 09:36:58 +01:00
Travis Ralston
0cec74cc2b Appease the linter (and the project) 
Also export the interface that the project expects to be able to import :|
 2020-05-25 15:59:15 -06:00
Michael Telatynski
ddcfe881c4
Merge pull request #4629 from matrix-org/t3chguy/fix-baseavatar-hooks 
Fix BaseAvatar wrongly retrying urls
 2020-05-25 22:29:22 +01:00
Michael Telatynski
608a1feb03
Merge pull request #4637 from matrix-org/t3chguy/edit_highlights 
Fix event highlights not being updated to reflect edits
 2020-05-25 19:05:50 +01:00
Michael Telatynski
0861b1fbec remove redundant props 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-25 19:05:02 +01:00
Michael Telatynski
148f215d4e clean up 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-25 19:02:44 +01:00
Jorik Schellekens
dfc73626fa Fix import 2020-05-25 18:18:47 +01:00
Jorik Schellekens
fc1f14f5aa Appease the types 2020-05-25 17:53:09 +01:00
Jorik Schellekens
303691eb72 Missing export 2020-05-25 17:37:07 +01:00
Jorik Schellekens
b4624baf2f
Merge branch 'develop' into joriks/field-ts 2020-05-25 17:29:25 +01:00
Jorik Schellekens
5c9398a6b1 Types exiliary files 2020-05-25 16:47:57 +01:00
Michael Telatynski
1a47ceb322 Fix event highlight with edits 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-25 16:17:46 +01:00
Michael Telatynski
6677a3f20e Implement Tabs with Automatic Activation pattern for EmojiPicker header 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-25 15:46:44 +01:00
Michael Telatynski
457f4c82db Make some ARIA promises 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-25 14:59:03 +01:00
Travis Ralston
0e41bde875
Merge pull request #4625 from matrix-org/travis/new-badges 
Calculate badges in the new room list more reliably
 2020-05-25 06:48:16 -06:00
Jorik Schellekens
63f78b0808 Move tooltip to ts 2020-05-25 13:40:05 +01:00
Michael Telatynski
c372e8edee fix viewGroup to actually show the group if possible 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-25 11:29:56 +01:00
Michael Telatynski
1f52b5e203 Update Crypto Store Too New copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-25 10:59:31 +01:00
Michael Telatynski
cf7acded50 Simply BaseAvatar hooks 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-24 14:12:16 +01:00
Michael Telatynski
5e00481639 Fix sentMessageAndIsAlone by dispatching message_sent more consistently 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-24 13:08:29 +01:00
Michael Telatynski
22dba5f794 Merge branches 't3chguy/toasts3' and 't3chguy/toasts3_1' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3_1 2020-05-23 11:22:19 +01:00
Michael Telatynski
4892d8cdd0 Merge branches 't3chguy/toasts3' and 't3chguy/toasts3_2' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3_2 2020-05-23 11:19:20 +01:00
Michael Telatynski
880e16aaa2 Merge branches 'develop' and 't3chguy/leaks' of github.com:matrix-org/matrix-react-sdk into t3chguy/leaks 
 Conflicts:
	src/components/views/avatars/BaseAvatar.js
	test/components/views/messages/TextualBody-test.js
 2020-05-23 11:12:58 +01:00
Michael Telatynski
efeb8a8487 Merge branches 'develop' and 't3chguy/toasts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3 2020-05-23 11:01:36 +01:00
Michael Telatynski
066dd4b611 Update Modular hosting link 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-23 08:48:28 +01:00
Travis Ralston
3a3ddbf7c4 Add missing documentation 2020-05-22 18:10:30 -06:00
Travis Ralston
a19e27d11c Calculate badges in the new room list more reliably 
Fixes https://github.com/vector-im/riot-web/issues/13757

This uses a different way of calculating the badges by using about 6 less variables, and consolidating the remaining ones down.
 2020-05-22 18:05:09 -06:00
Michael Telatynski
4193426808 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 23:14:33 +01:00
Michael Telatynski
891ba1bbe3 Replace New Version Bar with a Toast 
discards the `new_version` dispatch

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 23:08:45 +01:00
Michael Telatynski
ccf9e65123 Migrate Server Limit Bar Banner to a Toast 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 22:27:19 +01:00
Michael Telatynski
5d0040b8b3 Migrate Password Nag Bar Banner to a Toast 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 22:15:22 +01:00
Michael Telatynski
c91f8c2631 Migrate Analytics Banner to a Toast 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 22:04:21 +01:00
Michael Telatynski
3732d1f5a5 Migrate Desktop Notifications MatrixToolbar to a Toast 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 21:56:25 +01:00
Michael Telatynski
08fadb092c Remove redundant component 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 21:43:15 +01:00
Aaron Raimist
c2dd4a5771 Merge branch 'develop' into redaction-timestamp 2020-05-22 15:16:12 -05:00
Aaron Raimist
b0be99a8f0
Show timestamp of redaction on hover 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-05-22 14:41:32 -05:00
Michael Telatynski
4e67e46863 fix countSeen 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 14:29:30 +01:00
Michael Telatynski
c464abaa49 Iterate toast count indicator more logically 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 14:28:01 +01:00
Michael Telatynski
ac0d794877 Fix: Tag_DM is not defined 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 13:49:56 +01:00
Michael Telatynski
14cee41360 Convert things to Typescript and re-use a generic component 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 13:29:53 +01:00
Michael Telatynski
b21e5ba10b Set new granular priorities 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 12:57:48 +01:00
Michael Telatynski
dc37469808 Convert ToastContainer and ToastStore to Typescript 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 12:47:40 +01:00
Michael Telatynski
37bd59bf90 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/peeking-races 2020-05-22 11:18:19 +01:00
Michael Telatynski
67ffe94df4 Fix typo and improve error context 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 11:18:14 +01:00
Travis Ralston
7ff850deea
Merge pull request #4253 from matrix-org/travis/room-list-2 
Rewrite the room list store
 2020-05-21 13:30:32 -06:00
Travis Ralston
559dd98d01 Fix comment style to be less bothersome 2020-05-21 11:53:16 -06:00
Michael Telatynski
f539a960e1 re-add brackets 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-21 17:50:32 +01:00
Michael Telatynski
1dfd62c142 iterate alignment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-21 17:47:35 +01:00
Michael Telatynski
6a0ffe905f Iterate text alignment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-21 17:12:16 +01:00
Michael Telatynski
7e7c48e046 Improve style of toasts to match Figma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-21 16:32:19 +01:00
David Baker
5d1c01fd6f Fix key backup restore with SSSS 
The room / session ID params come after the backupInfo for restoring
from SSSS so the options object was being passed into the wrong param.
Roll on TypeScript.

This meant restoring backups worked fine when the key was cached but
failed when it wasn't.

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4507
 2020-05-21 12:26:27 +01:00
Jorik Schellekens
50a44405f0 CONSTANT_CASING 2020-05-20 15:17:47 +01:00
Jorik Schellekens
82b76192ae Fixes, lints and i18n 2020-05-20 14:44:56 +01:00
Jorik Schellekens
6d9d4ee547 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-05-20 13:46:17 +01:00
Jorik Schellekens
55e72dd5bf Remove min and max font setting 2020-05-20 13:45:54 +01:00
Jorik Schellekens
3e30df17fb Slider is more responsive 2020-05-20 13:07:33 +01:00
Travis Ralston
b96c1ada8a
Merge pull request #4494 from pv/auxpanel-scrolling-persisted 
Prevent PersistedElements overflowing scrolled areas
 2020-05-19 15:28:58 -06:00
Jorik Schellekens
323d0762fc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/irc-ui 2020-05-19 18:03:44 +01:00
Jorik Schellekens
2e325191bc Merge remote-tracking branch 'nv/develop' into joriks/irc-ui 2020-05-19 17:18:36 +01:00
Jorik Schellekens
286828b3bb Disable irc mode in notifiactions panel 2020-05-19 16:15:13 +01:00
Michael Telatynski
af2eed2228 Fix room alias lookup vs peeking race condition 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-19 13:18:50 +01:00
Michael Telatynski
e7d37228f2
Merge pull request #4603 from matrix-org/t3chguy/add_room_tooltip 
Label the create room button better than "Add room"
 2020-05-19 11:57:59 +01:00
Michael Telatynski
0016d8e744 Add e2ee_default_for_private_rooms to control default e2ee behaviour 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-19 11:36:44 +01:00
Travis Ralston
38920e7f30 Merge branch 'develop' into travis/room-list-2 2020-05-18 23:23:59 -06:00
Travis Ralston
9aff2e836e
Merge pull request #4593 from matrix-org/travis/dispatcher-types 
Convert the dispatcher to TypeScript
 2020-05-18 23:22:32 -06:00
Jorik Schellekens
7bb7f30b8f missed one 2020-05-18 22:02:22 +01:00
Jorik Schellekens
4deeef5fca Remove ability to remove avatars 2020-05-18 16:57:00 +01:00
Jorik Schellekens
5380e76b7b lint 2020-05-18 16:43:47 +01:00
Jorik Schellekens
17f535e5f8 Fix review problems 
- removed superfluous position and classes
- fixed compact view
- fixed event list summary avatar and text overlap
- fixed a problem where the mention list refuses to load.
 2020-05-18 16:37:10 +01:00
Michael Telatynski
1eea203db6
Merge pull request #4599 from matrix-org/t3chguy/progress_colour 
Consolidate password/passphrase fields into a component & add dynamic colour to progress
 2020-05-18 11:08:08 +01:00
Michael Telatynski
54640dcaac
Merge pull request #4590 from matrix-org/t3chguy/userview 
UserView, show Welcome page in the mid panel instead of empty space
 2020-05-18 11:07:49 +01:00
Michael Telatynski
a864643d98 Label the create room button something better than "Add room" 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-18 10:37:02 +01:00
Travis Ralston
798e7a1f86 Merge branch 'develop' into travis/dispatcher-types 2020-05-15 09:56:02 -06:00
David Baker
07eed94b35
Merge pull request #4600 from matrix-org/dbkr/fix_email_sent_to_blank 
Make email auth component fail better if server claims email isn't validated
 2020-05-15 14:33:20 +01:00
David Baker
523067e5f9 Make email auth component fail better if server claims email isn't validated 
https://github.com/matrix-org/synapse/issues/7512 means that (at least)
sometimes after clicking on the email validation link and being redirected
to riot, the server will claim the email identity auth stage is still incomplete.

This meant that we displayed the email identity UIA component but with an empty
email address, because we don't know that in the new session. Work around this by
assuming that if the email UIA component is being displayed but we don't have an
email address input, the link has been clicked and we're just waiting for the poll.

Also don't fire off an initial register request if we're already mid-UI-auth, because
that's confusing and unnecessary.

Also also remove unused requestingToken state.

Fixes https://github.com/vector-im/riot-web/issues/13434
 2020-05-15 13:32:12 +01:00
Michael Telatynski
5844bee8f2 Merge branches 'develop' and 't3chguy/leaks' of github.com:matrix-org/matrix-react-sdk into t3chguy/leaks 
 Conflicts:
	src/components/views/avatars/BaseAvatar.js
 2020-05-15 00:16:41 +01:00
Michael Telatynski
89c16603fc Remove the now inlined ZxcvbnProgressBar.tsx 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-14 21:06:18 +01:00
Michael Telatynski
865495dd69 replace zxcvbn field in CreateSecretStorageDialog with PassphraseField 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-14 20:50:22 +01:00
Travis Ralston
6cb1efc1a4 Use the new TS dispatcher 2020-05-14 13:45:17 -06:00
Travis Ralston
2b4c19e9ba Merge branch 'travis/dispatcher-types' into travis/room-list-2 2020-05-14 13:40:37 -06:00
Michael Telatynski
cf3c4d9e5f Extract Password field from Registration into a reusable component 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-14 20:20:36 +01:00
Travis Ralston
f8cbadaba5 Clean up comments in skeleton components 2020-05-14 12:53:00 -06:00
Travis Ralston
c37352679d Fix bold rooms not bolding 2020-05-14 12:46:16 -06:00
Travis Ralston
e8c33161ec Initial work on badges 
This doesn't work for bold rooms
 2020-05-14 12:46:16 -06:00
Travis Ralston
6bdcbd0f3d Support switching rooms 2020-05-14 12:46:16 -06:00
Travis Ralston
715dd7e1b6 Prepare tooltip for collapsed support 2020-05-14 12:46:16 -06:00
Travis Ralston
9f0810240f Clean up imports and other minor lints 2020-05-14 12:46:16 -06:00
Travis Ralston
cb3d17ee28 Bare minimum for rendering a room list 
This is non-interactive and missing most features users will expect to have
 2020-05-14 12:46:16 -06:00
Travis Ralston
ea34bb3022 Make component index happy 2020-05-14 12:46:16 -06:00
Travis Ralston
5dda7f02cf Early handling of dispatched events 
A possible approach to handling the various triggers for recategorizing rooms.
 2020-05-14 12:46:16 -06:00
Travis Ralston
09b7f39df8 Simple rendering of the room list for visual aid 
This is largely meant to prove the algorithm works and nothing more.
 2020-05-14 12:45:35 -06:00
Travis Ralston
861268d39f Invent an AsyncStore and use it for room lists 
This is to get around the problem of a slow dispatch loop. Instead of slowing the whole app down to deal with room lists, we'll just raise events to say we're ready.

Based upon the EventEmitter class.
 2020-05-14 12:44:29 -06:00
Travis Ralston
08419d195e Initial breakout for room list rewrite 
This does a number of things (sorry):
* Estimates the type changes needed to the dispatcher (later to be replaced by https://github.com/matrix-org/matrix-react-sdk/pull/4593)
* Sets up the stack for a whole new room list store, and later components for usage.
* Create a proxy class to ensure the app still functions as expected when the various stores are enabled/disabled
* Demonstrates a possible structure for algorithms
 2020-05-14 12:44:29 -06:00
Michael Telatynski
8dd561d28a Convert Validation to TypeScript 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-14 19:33:17 +01:00
Michael Telatynski
93a608a644 flatten out passwordSafe as it was a derived state value 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-14 19:31:40 +01:00
Michael Telatynski
562c5aa9c5
Merge pull request #4588 from matrix-org/t3chguy/kbd1 
Add new keyboard shortcuts for jump to unread and upload file
 2020-05-14 19:29:09 +01:00
Michael Telatynski
09a4af49f3 Consolidate zxcvbn progress bars into a component and add dynamic colour 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-14 18:49:55 +01:00
Michael Telatynski
239197a3cb
Merge pull request #4394 from matrix-org/t3chguy/qrcode 
wrap node-qrcode in a React FC and use it for ShareDialog
 2020-05-14 17:31:26 +01:00
Michael Telatynski
dd747a9a09
Merge pull request #4585 from matrix-org/t3chguy/sso_hash 
Pass screenAfterLogin through SSO in the callback url
 2020-05-14 17:30:31 +01:00
Travis Ralston
cae28b48d6 Remove debugging that causes email addresses to load forever 
This was left in by accident for https://github.com/matrix-org/matrix-react-sdk/pull/4557
 2020-05-14 09:43:34 -06:00
Travis Ralston
acc17e6026
Merge pull request #4584 from matrix-org/travis/deactivate-fix 
Acquire a new session before enacting deactivation
 2020-05-14 07:52:17 -06:00
Michael Telatynski
4c7d703275 Reuse QRCode for VerificationQRCode and specify widths 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-14 11:20:27 +01:00
Michael Telatynski
1ba19e78f8 Merge branches 'develop' and 't3chguy/qrcode' of github.com:matrix-org/matrix-react-sdk into t3chguy/qrcode 
 Conflicts:
	package.json
 2020-05-14 10:50:42 +01:00