Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
39,695 Commits 1 Branch 646 Tags
8dd0722e04bfb20074fc8083227ba7671cda3078
Commit Graph

5907 Commits

Author SHA1 Message Date
Travis Ralston 2eafe132b8 Move various createRoom types to the js-sdk 2021-06-14 13:31:58 -06:00
Šimon Brandner fdda534053 Merge branch 'develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-09 19:23:14 +02:00
Germain 91a88f25a8 Merge pull request #6168 from matrix-org/gsouquet/fix-17586 
Revert refreshStickyHeaders optimisations
 2021-06-09 16:34:11 +01:00
Germain Souquet 927de02a8e Revert refreshStickyHeaders optimisations 2021-06-09 14:59:55 +01:00
Germain Souquet ceed6ecbe8 Restore Page Up/Down key bindings when focusing the composer 2021-06-09 14:03:31 +01:00
Jaiwanth 6160b11eb8 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-09 16:46:28 +05:30
Germain 8334a2ba60 Merge pull request #6143 from robintown/hide-events-perf 2021-06-09 09:13:56 +01:00
Michael Telatynski 2938bfbadf Merge pull request #6162 from matrix-org/t3chguy/fix/17596 
Fix upgrade to element home button in top left menu
 2021-06-08 17:48:45 +01:00
Michael Telatynski 90982f9b3f Fix upgrade to element home button in top left menu 2021-06-08 17:31:08 +01:00
Jaiwanth dbb3614374 Merge branch 'develop' into export-conversations 2021-06-08 18:43:03 +05:30
Robin Townsend b97867271b Merge branch 'develop' into improved-forwarding-ui 2021-06-07 19:09:36 -04:00
Michael Telatynski 801b5f9c1a Merge pull request #6155 from matrix-org/t3chguy/spacesteammatewarning 
Add warning to private space creation flow
 2021-06-07 22:21:07 +01:00
Germain Souquet 187a367111 Add prop to alwaysShowTimestamps on TimelinePanel 2021-06-07 17:11:14 +01:00
Michael Telatynski f3aa505673 Add warning to private space creation flow 2021-06-07 14:14:31 +01:00
Michael Telatynski bd8fd77d54 Merge pull request #6148 from robintown/fix-timestamps 2021-06-07 13:12:11 +01:00
Germain Souquet d111f4cbb1 Merge branch 'develop' into gsouquet/fix-files-scroll-token 2021-06-07 12:25:08 +01:00
Germain Souquet a6ddffe74c Add scroll token to file and notif event tiles 2021-06-07 09:26:42 +01:00
Robin Townsend 1e574307d0 Cache lowBandwidth setting to speed up BaseAvatar 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-06 23:08:47 -04:00
Robin Townsend 903d4d252a Add optimized function to determine whether event has text to display 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-06 23:06:56 -04:00
Robin Townsend ea2120bdfd Fix timestamps 
7f83590846 changed timestamps to be hidden
at the DOM level, not the CSS level. We can keep that approach, we just
need to ensure they still get shown at the right times.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-06 01:55:01 -04:00
Robin Townsend b06da16a85 Fix jumping to bottom without a highlighted event 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-05 13:20:27 -04:00
Robin Townsend a06306d560 Merge branch 'develop' into improved-forwarding-ui 2021-06-05 11:04:17 -04:00
Panagiotis 1d6ac0e219 Merge branch 'develop' into fix/call-search-areas 2021-06-05 14:23:12 +03:00
Panagiotis a6bcb59251 Merge branch 'develop' into fix/call-search-areas 2021-06-05 12:39:18 +03:00
Jaiwanth 8786c97cdb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-05 11:27:08 +05:30
Robin Townsend 3bf8e54d7f Use cached RoomContext settings values throughout rooms 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-05 01:25:43 -04:00
Robin Townsend 48d3e41351 Cache frequently used settings values in RoomContext 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-05 01:23:51 -04:00
Šimon Brandner 8c533c7f8b Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-06-04 08:09:31 +02:00
Travis Ralston 12e013508d Merge pull request #6132 from matrix-org/travis/ts-mtxcli 
Adapt for js-sdk MatrixClient conversion to TS
 2021-06-04 00:07:22 -06:00
Šimon Brandner 6eb33ac730 Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-04 07:49:05 +02:00
Michael Telatynski 5d0d81e79a not sure how I butchered this merge conflict resolution this much. 2021-06-03 19:37:26 +01:00
Michael Telatynski 93010d34fd Merge branch 'develop' into t3chguy/fix/6606 2021-06-03 19:33:09 +01:00
Germain 7f83590846 Merge pull request #6079 from matrix-org/gsouquet/switch-rooms 2021-06-03 08:44:01 +01:00
Michael Telatynski 4f50727010 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606 
 Conflicts:
	src/components/structures/RoomView.tsx
	src/components/views/right_panel/UserInfo.tsx
 2021-06-03 08:42:05 +01:00
Michael Telatynski 83d223475b delint imports 2021-06-03 08:41:22 +01:00
Michael Telatynski 42a3ace82a Iterate PR based on feedback 2021-06-03 08:35:12 +01:00
Michael Telatynski 3f12b7280d Make AutoHideScrollbar pass through all unknown props 2021-06-03 08:31:06 +01:00
Michael Telatynski 079a5c10ad Respect space ordering field in m.tag for top level spaces 2021-06-02 16:43:38 +01:00
Germain Souquet bc50028f70 Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash 2021-06-02 13:57:33 +01:00
Michael Telatynski da13ec16f3 Merge branch 't3chguy/fix/17529' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282 2021-06-02 12:42:55 +01:00
Michael Telatynski 35948374e9 remove unused imports 2021-06-02 11:56:49 +01:00
Germain 9d126c51e4 Merge pull request #6113 from matrix-org/gsouquet/improve-layout-rendering 2021-06-02 11:41:59 +01:00
Michael Telatynski bc3c759feb Add temporary mechanism for managing communities without dnd 2021-06-02 11:33:25 +01:00
Šimon Brandner 466a52e238 Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-06-02 10:45:35 +02:00
Šimon Brandner b202f997e3 Refactor setState() 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-02 10:30:17 +02:00
Šimon Brandner 521b2445a8 Refactoring and fixes 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-02 10:18:32 +02:00
Travis Ralston c9883f346c Build pass 1 2021-06-01 22:21:04 -06:00
Robin Townsend 56714525f2 Merge branch 'develop' into improved-forwarding-ui 2021-06-01 17:28:55 -04:00
Michael Telatynski 0b7d3f007a Remove react-beautiful-dnd 2021-06-01 17:35:31 +01:00
Šimon Brandner 3bf28e3a6b Remove Ended from SUPPORTED_STATES 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 16:29:52 +02:00