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

26121 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
0854924b8d iterate some more 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-02 23:51:02 +01:00
Michael Telatynski
404009c8cb Merge branches 'develop' and 't3chguy/room-list/3' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/3 
 Conflicts:
	src/components/structures/ContextMenu.tsx
	src/components/views/rooms/RoomSublist2.tsx
 2020-07-02 23:46:12 +01:00
Travis Ralston
95bc4a6f44
Merge pull request #4886 from matrix-org/travis/room-list/logs-1 
Remove a bunch of noisy logging from the room list
 2020-07-02 16:41:49 -06:00
Travis Ralston
98ce1dafee Remove a bunch of noisy logging from the room list 
None of these logs are actually needed for troubleshooting anymore.
 2020-07-02 16:39:36 -06:00
Michael Telatynski
08392d53f0
Merge pull request #4884 from matrix-org/t3chguy/room-lists/99 
Fix bell icon mismatch on room tile between hover and context menu
 2020-07-02 23:31:48 +01:00
Travis Ralston
8f3c8ba804
Merge pull request #4885 from matrix-org/travis/room-list/preview-crash-2 
Add a null guard for message event previews
 2020-07-02 16:25:30 -06:00
Travis Ralston
ae076a7439 Add a null guard for message event previews 2020-07-02 16:23:38 -06:00
Michael Telatynski
5c5482a8ae I've got 99 problems and this badge mismatch is no longer one 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-02 23:20:16 +01:00
Travis Ralston
cc23f23f19
Merge pull request #4881 from matrix-org/travis/room-list/enable-default 
Enable the new room list by default and trigger an initial render
 2020-07-02 15:28:36 -06:00
Travis Ralston
df05273225 Merge remote-tracking branch 'origin/joriks/room-list-tooltips' into develop 2020-07-02 15:20:27 -06:00
Travis Ralston
1df092d79b
Merge pull request #4879 from matrix-org/travis/room-list/context-menu-fixes 
Fix selection states of room tiles in the new room list
 2020-07-02 15:18:19 -06:00
Travis Ralston
ea787ad430
Merge pull request #4876 from matrix-org/travis/room-list/notif-dropdown 
Update mute icon behaviour for new room list designs
 2020-07-02 15:15:56 -06:00
Travis Ralston
3847dc91c0 Move the stoppage to somewhere more generic 2020-07-02 15:15:33 -06:00
Travis Ralston
a6e0799b57 Handle push rule changes in the RoomNotificationState 2020-07-02 15:05:01 -06:00
Travis Ralston
547690374e Wrap event stoppage in null checks 
Some of the code paths (particularly onFinished) do not have events, but the code paths we care about to prevent the room selection do have events - we can stop those without stopping further menus.
 2020-07-02 14:53:21 -06:00
Travis Ralston
0549ef83db
Merge pull request #4878 from matrix-org/travis/room-list/fix-community-invites 
Fix alignment of avatars on community invites
 2020-07-02 14:39:25 -06:00
Travis Ralston
420f3fdbc9
Merge pull request #4880 from matrix-org/travis/room-list/fix-elongation 
Don't include empty badge container in minimized view
 2020-07-02 14:38:56 -06:00
Travis Ralston
e013597e26
Merge pull request #4877 from matrix-org/travis/room-list/dot-badge-align 
Fix alignment of dot badges in new room list
 2020-07-02 14:38:45 -06:00
Travis Ralston
1b782ce5f2 Enable the new room list by default and trigger an initial render 
We have to trigger an initial render because during the login process the user will have started syncing (causing lists to generate) but the RoomList component won't be mounted & listening and therefore won't receive the initial lists. By generating them on mount, we ensure that the lists are present once the user gets through the login process.
 2020-07-02 14:27:36 -06:00
Travis Ralston
0d9ce0721f Don't include empty badge container in minimized view 
Fixes https://github.com/vector-im/riot-web/issues/14294

It takes up space, and it won't hold anything anyways.
 2020-07-02 14:11:31 -06:00
Travis Ralston
e08512020f Fix a couple badge alignment issues with community invites 2020-07-02 14:05:31 -06:00
Travis Ralston
aa702514ce Don't try and show context menus if we don't have one 
Fixes https://github.com/vector-im/riot-web/issues/14295
 2020-07-02 13:59:28 -06:00
Travis Ralston
e51f9d2492 Fix closing the context menu causing the tile to be selected 
Fixes https://github.com/vector-im/riot-web/issues/14293
 2020-07-02 13:53:38 -06:00
Travis Ralston
c3ad854868 Fix alignment of avatars on community invites 2020-07-02 13:50:25 -06:00
Travis Ralston
7ea3164507 Fix alignment of dot badges in new room list 2020-07-02 13:39:20 -06:00
Travis Ralston
a5001e50aa Disable all unread decorations on muted rooms 2020-07-02 13:33:24 -06:00
Travis Ralston
349c3f7090 Only show mute notification icon on rooms, not all notif icons 2020-07-02 13:33:06 -06:00
Travis Ralston
9fec5c98af
Merge pull request #4861 from matrix-org/travis/room-list/notification-state 
Reorganize and match new room list badges to old list behaviour
 2020-07-02 13:28:23 -06:00
Travis Ralston
45f4a2a980 Fix imports for NotificationStates 2020-07-02 13:28:06 -06:00
Travis Ralston
b54635863f Merge branch 'develop' into travis/room-list/notification-state 2020-07-02 13:26:16 -06:00
Travis Ralston
e98f6ca656
Merge pull request #4862 from matrix-org/joriks/room-list-breadcrumbs 
Implement breadcrumb notifications and scrolling
 2020-07-02 13:24:12 -06:00
Travis Ralston
b65972d44f Fix indentation 2020-07-02 13:23:20 -06:00
Travis Ralston
43db4b98df Merge branch 'develop' into joriks/room-list-breadcrumbs 2020-07-02 13:22:51 -06:00
Michael Telatynski
4a03b464d6
Merge pull request #4875 from matrix-org/t3chguy/room-list/4 
Add click-to-jump on badge in the room sublist header
 2020-07-02 20:04:43 +01:00
Michael Telatynski
ae2a6ebc07 improve comments 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-02 19:56:41 +01:00
Michael Telatynski
a658612078 Add click-to-jump on badge in the room sublist header 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-02 19:48:06 +01:00
Michael Telatynski
c4bbdefa8d
Merge pull request #4870 from matrix-org/t3chguy/room-list/2 
Room List v2 context menu interactions
 2020-07-02 18:02:21 +01:00
Travis Ralston
eac4eb7ed9
Merge pull request #4874 from matrix-org/travis/room-list/community-invites 
Wedge community invites into the new room list
 2020-07-02 09:29:05 -06:00
Travis Ralston
32642d592c Add a key 2020-07-02 09:27:42 -06:00
Travis Ralston
b7aa8203b6 Wedge community invites into the new room list 
Fixes https://github.com/vector-im/riot-web/issues/14179

Disclaimer: this is all of the horrible because it's not meant to be here. Invites in general are likely to move out of the room list, which means this is temporary. Additionally, the communities rework will take care of this more correctly. For now, we support the absolute bare minimum to have them shown.
 2020-07-02 09:04:38 -06:00
Jorik Schellekens
1c0d46b6e1 Make breadcrumbs respsect setting 2020-07-02 15:26:51 +01:00
J. Ryan Stinnett
60e59bccce
Merge pull request #4873 from matrix-org/jryans/room-view-crypto-crash 
Check whether crypto is enabled in room recovery reminder
 2020-07-02 14:04:15 +01:00
J. Ryan Stinnett
209b386e23 Merge remote-tracking branch 'origin/develop' into jryans/room-view-crypto-crash 2020-07-02 13:46:50 +01:00
J. Ryan Stinnett
a928785f72 Check whether crypto is enabled in room recovery reminder 
This avoids a soft crash that may occur otherwise.

Fixes https://github.com/vector-im/riot-web/issues/14289
 2020-07-02 13:19:27 +01:00
J. Ryan Stinnett
b5c94acbe6 Remove unused crypto import 2020-07-02 13:17:51 +01:00
Michael Telatynski
8a591d5b1e
Merge pull request #4872 from matrix-org/t3chguy/room-list/4 
Fix room list 2's room tile wrapping wrongly
 2020-07-02 12:52:29 +01:00
Michael Telatynski
c259408d71 fix alignment of dot and simplify CSS rules 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-02 12:35:06 +01:00
Michael Telatynski
992349944a Fix room list 2's room tile wrapping wrongly 2020-07-02 12:18:48 +01:00
Michael Telatynski
9fcc2ced3d fix types some more 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:59:06 +01:00
Michael Telatynski
07e0a017e7 fix types 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:56:57 +01:00