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

10882 commits

Author SHA1 Message Date
Hubert Chathi
74e4ea7d48
Merge pull request #4797 from matrix-org/uhoreg/distrust_backup 
Mark messages with a black shield if the megolm session isn't trusted
 2020-06-23 15:38:03 -04:00
Jorik Schellekens
1e39279a77
Merge pull request #4761 from matrix-org/joriks/appearance-advanced 
Custom font selection
 2020-06-23 15:38:50 +01:00
J. Ryan Stinnett
3829362754 Fix up merge to develop 2020-06-23 15:24:02 +01:00
RiotRobot
6161f95434 Merge branch 'master' into develop 2020-06-23 15:18:35 +01:00
David Baker
6ce8584337 Implement first screen (recovery key / passphrase choice) 2020-06-23 15:04:39 +01:00
Jorik Schellekens
680e997a94 Cleanup tooltip classnames 2020-06-23 13:38:50 +01:00
Travis Ralston
fc5ee64fce Fix read receipt handling in the new room list 
Fixes https://github.com/vector-im/riot-web/issues/14064
Fixes https://github.com/vector-im/riot-web/issues/14082

Turns out the event doesn't reference a room, so we need to use the accompanied room reference instead.
 2020-06-22 15:12:30 -06:00
Travis Ralston
fb551781c2 Force DMs to always be red notifications 
This also passes the tagId to the sublist so it doesn't have to rip it out of the `layout`. It doesn't get a layout until later anyways, which causes some null issues.
 2020-06-22 14:52:17 -06:00
Travis Ralston
894357f7f6 Merge branch 'develop' into travis/room-list/unread-2 2020-06-22 14:16:52 -06:00
Travis Ralston
26317b6826
Merge pull request #4803 from matrix-org/travis/room-list/setting-diff 
Only fire setting changes for changed settings
 2020-06-22 14:16:24 -06:00
Travis Ralston
1fe3e33dbf Factor out cloning to a util and use it everywhere 2020-06-22 14:14:43 -06:00
Travis Ralston
aca6c65ef3
Merge pull request #4810 from matrix-org/travis/room-list/theme 
Have the theme switcher set the device-level theme to match settings
 2020-06-22 13:53:03 -06:00
Travis Ralston
f66f220a3e
Merge pull request #4808 from matrix-org/travis/room-list/collapsed 
Fix layout of minimized view for new room list
 2020-06-22 13:51:38 -06:00
Travis Ralston
6c48966bf5 Have the theme switcher set the device-level theme to match settings 
Fixes https://github.com/vector-im/riot-web/issues/14111

This is a shortcut into the Appearance tab, so use the same level. It was an explicit decision to have the tab set the theme at the device level.
 2020-06-22 13:34:49 -06:00
Travis Ralston
1a427b8ff7 Fix sticky headers over/under extending themselves in the new room list 
Fixes https://github.com/vector-im/riot-web/issues/14095
 2020-06-22 13:09:42 -06:00
Travis Ralston
cf92fc37d4 Fix layout of minimized view for new room list 2020-06-22 12:51:53 -06:00
Travis Ralston
63ad14ae1e Clean up imports 2020-06-22 10:35:55 -06:00
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