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

26091 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
3847dc91c0 Move the stoppage to somewhere more generic 2020-07-02 15:15:33 -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
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
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
4b27a67e33 improve default behaviour for consistency 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:16:54 +01:00
Michael Telatynski
6424ffb22a fix repeated context menu interaction by not erroring 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:13:54 +01:00
Michael Telatynski
e8702aafa5 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:09:02 +01:00
Michael Telatynski
5c2b291510 Support right click context menu interactions on Room List 2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:06:26 +01:00
Michael Telatynski
89bd572371 Fix context menu nesting causing bubbling and instabilities 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:05:37 +01:00
Jorik Schellekens
62314cac06
Merge pull request #4863 from matrix-org/joriks/room-list-autohide-scrollbar 
Hide scrollbar without pixel jumping
 2020-07-01 20:07:32 +01:00
Michael Telatynski
28e430060c
Merge pull request #4858 from matrix-org/t3chguy/room-list/2 
Room Tile context menu, notifications, indicator and placement
 2020-07-01 19:20:09 +01:00
Travis Ralston
51ce80f333 Merge branch 'develop' into travis/room-list/notification-state 2020-07-01 12:01:07 -06:00
Travis Ralston
2cd6fae2ce
Merge pull request #4865 from matrix-org/travis/room-list/default-vis 
Improve resizing interactions in the new room list
 2020-07-01 11:59:54 -06:00
Travis Ralston
946fde5cc5 Be consistent in visible tiles usage 2020-07-01 11:59:32 -06:00
Jorik Schellekens
d203943b7f lint semis 2020-07-01 16:07:27 +01:00
Jorik Schellekens
2162517a37 Display breadcrumbs only after 20 rooms have been joined 2020-07-01 16:05:27 +01:00
Jorik Schellekens
ad27dbbfab Clean up classnames 2020-07-01 15:15:18 +01:00
Michael Telatynski
9831698b1e Hide notifications menu from invite tiles 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 14:28:00 +01:00
Michael Telatynski
10e547539d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/2 2020-07-01 14:26:56 +01:00
Michael Telatynski
0cbc506ad6 add missing svg 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 14:26:50 +01:00
Travis Ralston
fed0c327d5
Merge pull request #4866 from matrix-org/travis/room-list/rm-ordering-options 
Disable use of account-level ordering options in new room list
 2020-07-01 07:25:04 -06:00
Travis Ralston
a78728acbf
Merge pull request #4867 from matrix-org/travis/room-list/invite-menu 
Remove context menu on invites in new room list
 2020-07-01 07:24:52 -06:00
Travis Ralston
dc182b9012
Merge pull request #4868 from matrix-org/travis/room-list/preview-crash 
Fix reaction event crashes in message previews
 2020-07-01 07:24:43 -06:00
Michael Telatynski
3b7b6eca6f align context menus even better 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 14:05:33 +01:00
J. Ryan Stinnett
0a6ce5ee0a
Merge pull request #4869 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2020-07-01 14:05:07 +01:00
strix aluco
9434923da3 Translated using Weblate (Ukrainian) 
Currently translated at 26.2% (618 of 2355 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
 2020-07-01 13:03:55 +00:00
Michael Albert
1e81049801 Translated using Weblate (German) 
Currently translated at 99.2% (2336 of 2355 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-07-01 13:03:54 +00:00
XoseM
5ca4d352ee Translated using Weblate (Galician) 
Currently translated at 100.0% (2355 of 2355 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-07-01 13:03:53 +00:00
Kévin C
2db0bb570a Translated using Weblate (French) 
Currently translated at 100.0% (2355 of 2355 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-07-01 13:03:50 +00:00