Commit graph

1662 commits

Author SHA1 Message Date
Šimon Brandner
1f98ea4562
Use ignoreSelfEvent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-11 18:02:40 +02:00
Šimon Brandner
ee0eda7947
Add ignoreSelfEvent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-11 18:02:33 +02:00
Michael Telatynski
be85dcd1bf Delabs Spaces, keeping it as a default-on preference for the time being 2021-08-11 14:52:40 +01:00
Germain Souquet
d971802789 Create ThreadView phase in RightPanel 2021-08-10 14:30:12 +02:00
Michael Telatynski
2d3211ccf6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092 2021-08-04 12:14:29 +01:00
Michael Telatynski
a6e5112be0 Offer a way to create a space based on existing community 2021-08-04 10:37:35 +01:00
Šimon Brandner
d479373af9
Merge remote-tracking branch 'upstream/develop' into feature/incoming-call-toast
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 09:21:45 +02:00
Michael Telatynski
152c7dc865
Merge pull request #6523 from aaronraimist/fix-mjolnir 2021-08-02 13:48:43 +01:00
RiotRobot
81b767ed89 Merge branch 'master' into develop 2021-08-02 13:08:09 +01:00
Travis Ralston
0923dd37ab Sanitize untrusted variables from message previews before translation
Fixes https://github.com/vector-im/element-web/issues/18314
2021-07-31 11:43:05 -06:00
Aaron Raimist
cf2a4ddde7
Fix typo which broke feature_mjolnir
Regressed in b2d9dd7214

Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-07-31 02:11:49 -05:00
Michael Telatynski
3c436c9617 update setting naming to match style 2021-07-30 12:20:02 +01:00
Michael Telatynski
9eb0986353 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089
 Conflicts:
	src/i18n/strings/en_EN.json
2021-07-30 11:34:52 +01:00
Michael Telatynski
d459dbe700 Refactor Space Hierarchy stuff in preparation for pagination 2021-07-29 17:35:15 +01:00
Michael Telatynski
02dbdc5c0a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093
 Conflicts:
	src/components/views/spaces/SpaceTreeLevel.tsx
	src/dispatcher/actions.ts
	src/i18n/strings/en_EN.json
2021-07-29 16:11:16 +01:00
Michael Telatynski
493cd01ed3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071
 Conflicts:
	res/css/views/dialogs/_AddExistingToSpaceDialog.scss
	src/utils/space.tsx
2021-07-29 15:22:52 +01:00
Michael Telatynski
6f37e8b223 Use getChildren instead of getSpaceSummary as MSC2946 has moved on 2021-07-29 12:16:59 +01:00
Michael Telatynski
ac800ad94d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093 2021-07-28 19:24:26 +01:00
Travis Ralston
b8781b7552
Merge pull request #6455 from matrix-org/travis/widget-customisation
Add customisation point for declaring widget variables
2021-07-28 07:15:45 -06:00
Michael Telatynski
776435f620 Switch all-rooms toggle for spaces to non-feature settings key 2021-07-27 21:17:24 +01:00
Michael Telatynski
0a9d3302ba Fix home vs all rooms requiring app reload and change default to home
Consolidate ALL_ROOMS and HOME_SPACE storage
Fix behaviour when recalled room is no longer part of the target space
Improve tests
2021-07-27 21:11:47 +01:00
Michael Telatynski
ec173e74e6 Test & Refactor SpaceWatcher to allow all rooms/home change without needing reload 2021-07-27 20:15:40 +01:00
Michael Telatynski
8c073a6439 RoomListStore removeFilter skip triggering update if nothing changed 2021-07-27 17:53:03 +01:00
Michael Telatynski
12461a79e1 Move SettingsStore setting_updated dispatch to action enum 2021-07-27 17:19:45 +01:00
Michael Telatynski
39d9ec3ced Merge branch 'develop' into t3chguy/fix/18071 2021-07-27 15:02:59 +01:00
Michael Telatynski
755007cbee Conclude labs flags and write more tests 2021-07-27 14:39:14 +01:00
Šimon Brandner
40947a2a68
Simplifie toast handling
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-26 12:21:58 +02:00
Šimon Brandner
379101e3ff
Remove an unused member
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 21:09:00 +02:00
Šimon Brandner
07be6dd780
Allow suppliing whole body to toasts
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 13:35:54 +02:00
Travis Ralston
2c4ab507d6
Merge pull request #6453 from matrix-org/travis/voice-messages/code-cleanup-1
Clean up voice messages code
2021-07-23 09:09:12 -06:00
Travis Ralston
bb0be4ba72 Add customisation point for declaring widget variables
Fixes https://github.com/vector-im/element-web/issues/18035 (indirectly; issue is on a non-standard version of Element).

This has an isReady() step because the variable usage code path cannot be made async, so instead we let the async loading state happen in the prepare() stage. This is required for the intended usecase.
2021-07-22 15:43:18 -06:00
Travis Ralston
eec63574e6 Move src/voice to src/audio for better naming
Many of these files are used by Audio and Voice messages.

Fixes https://github.com/vector-im/element-web/issues/18131
2021-07-22 09:26:26 -06:00
Michael Telatynski
18bb4bce35 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
 Conflicts:
	src/stores/SpaceStore.tsx
2021-07-22 12:44:27 +01:00
Jaiwanth
517e8951ee Apply suggestions from review 2021-07-22 08:30:18 +05:30
Jaiwanth
76040c652c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into spaces-jump-to-room 2021-07-22 08:25:24 +05:30
David Baker
a6c432d66f fix types
in varyingly hacky ways
2021-07-21 16:39:41 +01:00
Michael Telatynski
d147aaa984 delint and fix min-height issue 2021-07-21 11:27:36 +01:00
Michael Telatynski
fd64d37305 Add iconography to Create Room Dialog dropdown
Remove unused old stale feather-customised/globe.svg
2021-07-21 11:20:41 +01:00
Michael Telatynski
390b05617c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.tsx
	src/components/views/dialogs/RoomUpgradeDialog.tsx
	src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
2021-07-21 10:46:41 +01:00
Michael Telatynski
1b2d70d816 Prompt user to leave rooms/subspaces in a space when leaving space 2021-07-21 09:57:10 +01:00
Michael Telatynski
ce78cdf4ad Conform to new react and typescript eslint rules 2021-07-19 22:43:11 +01:00
Michael Telatynski
de42a00ca4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
 Conflicts:
	src/components/views/avatars/RoomAvatar.tsx
	test/stores/SpaceStore-test.ts
	test/test-utils.js
2021-07-19 16:47:31 +01:00
Michael Telatynski
e54a7f0997 Don't throw exception from setStickyRoom as it split-brains the RoomListStore 2021-07-19 09:36:25 +01:00
Šimon Brandner
c9a11af26b
Give singletonRoomViewStore a type
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:25:53 +02:00
Michael Telatynski
05028f1997 remove unused import 2021-07-16 09:22:25 +01:00
Michael Telatynski
191591e807 Make the critical sections of the RLS synchronous to avoid needing to mutex everything 2021-07-16 09:15:56 +01:00
Michael Telatynski
32cc48ff7a Fix issue with room duplication caused by filtering and selecting room using keyboard
Wrap sticky room updates in lock to prevent setStickyRoom running in middle of setKnownRooms
2021-07-16 08:49:19 +01:00
Michael Telatynski
ea20e041b1
Merge pull request #6382 from matrix-org/t3chguy/console 2021-07-15 13:50:13 +01:00
Michael Telatynski
59feff3763 Silence RoomListStore possible memory leak warning 2021-07-15 11:49:15 +01:00
Michael Telatynski
50b6c5c557 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spacesperf
 Conflicts:
	src/components/views/dialogs/InviteDialog.tsx
2021-07-15 10:19:04 +01:00
Michael Telatynski
dcb9b9b777 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
 Conflicts:
	src/components/views/elements/MiniAvatarUploader.tsx
	src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
	src/i18n/strings/en_EN.json
	src/settings/handlers/RoomSettingsHandler.ts
	src/stores/SpaceStore.tsx
2021-07-15 10:04:48 +01:00
Michael Telatynski
90d380c8ae Cache value of feature_spaces* flags as they cause page refresh so are immutable 2021-07-15 08:26:49 +01:00
Travis Ralston
421392f339 Exclude state events from widgets reading room events
They can request state reading permissions to read state.
2021-07-14 12:48:27 -06:00
Travis Ralston
5a51b7139c
Merge pull request #6371 from matrix-org/travis/widgets/fix-enc
Send clear events to widgets when permitted
2021-07-14 10:34:08 -06:00
Travis Ralston
c4b03064ae fix imports 2021-07-14 10:28:45 -06:00
Travis Ralston
5dc3d09dd8 Use new function name 2021-07-14 10:18:55 -06:00
Travis Ralston
9495ba001c Send clear events to widgets when permitted
Fixes https://github.com/vector-im/element-web/issues/17615
2021-07-13 23:17:17 -06:00
Michael Telatynski
ae6eaa5acc Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c1
 Conflicts:
	src/components/structures/RoomDirectory.tsx
	src/components/views/room_settings/RoomPublishSetting.tsx
2021-07-12 18:58:18 +01:00
Germain Souquet
36ba65b534 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-07-12 13:00:34 +02:00
Michael Telatynski
2ef714b9eb remove unused import 2021-07-12 10:49:19 +01:00
Michael Telatynski
bd175c6f40 Improve and consolidate typing 2021-07-10 15:43:46 +01:00
Michael Telatynski
a7aa87a9fc Fix right panel not closing user info when changing rooms 2021-07-09 14:43:07 +01:00
Michael Telatynski
437d53d1cc Update space children (best effort) when upgrading a room 2021-07-09 08:43:41 +01:00
Michael Telatynski
f412fb44a7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
 Conflicts:
	src/SlashCommands.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
	src/createRoom.ts
2021-07-09 08:13:39 +01:00
David Baker
72acd5a611
Merge pull request #6330 from matrix-org/dbkr/tsify_secretstorage
Update import location for types
2021-07-08 09:18:31 +01:00
David Baker
086a8cbbb3 Update import location for types
Apparently all the types themselves are fine, even though some of
the function signatures have been updated to return Promises... we
were alreaady await-ing on them.
2021-07-07 20:19:52 +01:00
Šimon Brandner
f91b35a0a0
Merge remote-tracking branch 'upstream/develop' into burn-sdk-get-comp-with-fire
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 17:12:19 +02:00
Germain Souquet
fbac730c62 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-07-06 15:09:55 +02:00
Germain Souquet
a5cec34bad Merge branch 'develop' into t3chguy/fix/17686 2021-07-06 14:53:40 +02:00
Michael Telatynski
692347843d Track restricted join rule support in the SpaceStore for sync access 2021-07-06 10:09:35 +01:00
Germain Souquet
edae9a4844 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-07-06 10:19:25 +02:00
Germain Souquet
e7743e2a57 Migrate RoomScrollStateStore to TypeScript 2021-07-03 12:21:00 +01:00
Šimon Brandner
b7ef7d2a47
Fifth batch of burning
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 10:06:42 +02:00
Michael Telatynski
89949bd884 Add new in the spaces beta toast & explanatory modal 2021-07-02 16:07:17 +01:00
David Baker
80f5232217 Comply with new member-delimiter-style rule
Just `eslint --fix` with rule from
https://github.com/matrix-org/eslint-plugin-matrix-org/pull/9 in place
2021-07-01 23:23:03 +01:00
David Baker
8bbb768825 Convert RoomHeader to TS
Also add a type of OOBData... possibly this should be in the js-sdk,
but threepid invites themselves have a type in react-sdk so it can
live alongside it I guess (also I'm not entirely sure we actually
use it anymore...)
2021-07-01 19:54:05 +01:00
Jaiwanth
f50604db78 missing semicolon 2021-06-30 12:13:39 +05:30
Jaiwanth
a99b24ef83 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into spaces-jump-to-room 2021-06-30 11:20:01 +05:30
Jaiwanth
1b21c8f732 Remove unreadRoomId from summarized notification state 2021-06-30 10:53:46 +05:30
Michael Telatynski
6250d9ba61
Merge branch 'develop' into t3chguy/ts/4 2021-06-29 22:24:47 +01:00
J. Ryan Stinnett
9d6d8fc666
Merge pull request #6285 from matrix-org/jryans/rework-linting-2
Migrate to `eslint-plugin-matrix-org`
2021-06-29 17:45:10 +01:00
Germain Souquet
d035151116 Avoid cyclic dependencies by moving watchers out of constructor 2021-06-29 17:04:51 +01:00
J. Ryan Stinnett
ae0a8b8da4 Auto-fix lint errors 2021-06-29 13:11:58 +01:00
Jaiwanth
746b11b24d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into spaces-jump-to-room 2021-06-29 14:31:08 +05:30
Michael Telatynski
208c62048f Fix right panel store cleaning some state when permalink within room is clicked 2021-06-28 15:48:13 +01:00
Germain Souquet
652ad3617d Backdrop filter compatibility for Firefox and Safari 2021-06-25 09:20:03 +01:00
Michael Telatynski
231b40473b fix the upset CI 2021-06-24 21:22:56 +01:00
Germain Souquet
27ee7c5836 Move backdrop filter to a canvas based solution 2021-06-24 17:51:11 +01:00
Šimon Brandner
ebe19168c2
Add allowClose to payload
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 10:39:45 +02:00
Michael Telatynski
49d20d2530 consolidate the two onRoomAccountData listeners 2021-06-22 21:22:30 +01:00
Michael Telatynski
6e3c647109 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282
 Conflicts:
	package.json
	src/components/views/spaces/SpacePanel.tsx
	src/i18n/strings/en_EN.json
	src/stores/SpaceStore.tsx
	yarn.lock
2021-06-22 21:15:53 +01:00
Michael Telatynski
cd04fb76dc Fix type error 2021-06-22 18:01:29 +01:00
Michael Telatynski
59052b1eb7
Merge pull request #6199 from matrix-org/t3chguy/fix/17665 2021-06-22 17:46:57 +01:00
Michael Telatynski
e3e6b74272 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665
 Conflicts:
	src/stores/SpaceStore.tsx
2021-06-22 17:38:05 +01:00
Michael Telatynski
59258585b3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/5 2021-06-22 17:28:19 +01:00
Michael Telatynski
847e3dcbce Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17128-1
 Conflicts:
	src/dispatcher/actions.ts
2021-06-22 14:11:37 +01:00
Michael Telatynski
845bb95887 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/5 2021-06-21 20:46:28 +01:00
Michael Telatynski
233e2aa425 Fix bugs identified by the typescripting 2021-06-18 16:22:31 +01:00
Michael Telatynski
0ae4e7b11d Fix typescript types 2021-06-18 16:21:46 +01:00
Germain Souquet
d22617c422 More specific type definition and adhering to code style better 2021-06-18 12:44:15 +01:00
Germain Souquet
3f1ca970d6 Merge branch 'develop' into gsouquet/dialogs-ts-migration 2021-06-18 12:27:00 +01:00
Michael Telatynski
3e38d92fa4 Fix up some more type defs 2021-06-17 14:49:27 +01:00
Michael Telatynski
02e72d8b04 Fix more type definitions 2021-06-17 14:24:53 +01:00
Michael Telatynski
cee294f5a7 iterate PR 2021-06-16 09:23:06 +01:00
Michael Telatynski
a75fb98fbc Fix some NPEs 2021-06-16 09:07:55 +01:00
Michael Telatynski
b4fbc791bb Add experimental options to the Spaces beta 2021-06-16 09:01:13 +01:00
Michael Telatynski
89221bde0f Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17128-1
 Conflicts:
	src/dispatcher/actions.ts
2021-06-15 13:58:13 +01:00
Michael Telatynski
a63d9220d2 Clear outstanding TODOs 2021-06-15 08:26:46 +01:00
Michael Telatynski
66fce64ee0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282
 Conflicts:
	package.json
	yarn.lock
2021-06-14 21:39:06 +01:00
Germain Souquet
5f2ab50a90 migrate SetupEncryptionStore to TypeScript 2021-06-14 20:58:20 +01:00
Michael Telatynski
a4fa2779d4 Iterate lexicographic ordering implementation 2021-06-11 10:33:00 +01:00
Michael Telatynski
21fc386317 Move over to new lexicographic string sorting 2021-06-10 11:40:10 +01:00
Germain Souquet
7f3173f170 Implement unencrypted warning slate in rooms 2021-06-10 11:14:43 +01:00
Robin Townsend
b97867271b Merge branch 'develop' into improved-forwarding-ui 2021-06-07 19:09:36 -04:00
Michael Telatynski
ced6c43147
Merge pull request #6152 from matrix-org/t3chguy/fix/17571
Fix Stickerpicker context menu
2021-06-07 22:21:19 +01:00
Michael Telatynski
b2d9dd7214 Convert LifecycleStore to Typescript 2021-06-07 10:57:39 +01:00
Michael Telatynski
31d308a1fb Fix Stickerpicker context menu 2021-06-07 09:22:47 +01:00
Michael Telatynski
271f544637 Stash 2021-06-07 08:59:57 +01:00
Robin Townsend
a06306d560 Merge branch 'develop' into improved-forwarding-ui 2021-06-05 11:04:17 -04: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
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
e334ce8192 First cut of space panel drag-and-drop ordering 2021-06-03 08:32:36 +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
96f5d3af05
Merge pull request #6130 from matrix-org/gsouquet/member-list-sort 2021-06-02 11:40:52 +01:00
Germain Souquet
d7a5547d80 use Intl.Collator over String.prototype.localeCompare for better performance 2021-06-02 10:42:17 +01:00
Travis Ralston
5b2dacd99e Adapt for js-sdk MatrixClient conversion to TS
For https://github.com/matrix-org/matrix-js-sdk/pull/1718
2021-06-01 21:36:28 -06:00
Robin Townsend
56714525f2 Merge branch 'develop' into improved-forwarding-ui 2021-06-01 17:28:55 -04:00
Michael Telatynski
1ea73ae9ae Fix all DMs wrongly appearing in room list when m.direct is changed 2021-06-01 10:18:57 +01:00
Germain Souquet
d894cc6f7a Merge branch 'develop' into gsouquet/switch-rooms 2021-06-01 09:02:28 +01:00
Germain Souquet
fcae19f831 Track left panel width using ResizeObserver 2021-05-27 12:36:16 +01:00
Germain Souquet
51d88062f9 Merge branch 'develop' into gsouquet/switch-rooms 2021-05-27 10:22:16 +01:00
Michael Telatynski
27ad90760d Iterate pinned messages 2021-05-26 13:51:17 +01:00
Germain Souquet
934af23b1f Fix preview generate check 2021-05-26 10:15:31 +01:00
Germain Souquet
c7c6a818f0 Merge branch 'develop' into gsouquet/switch-rooms 2021-05-26 09:51:27 +01:00
Germain Souquet
e934f81521 Skip generatePreview if event is not part of the live timeline 2021-05-25 16:34:52 +01:00
Michael Telatynski
59f4c728c9 Initial cut of Pinned event card in the right panel 2021-05-25 16:10:44 +01:00
Germain
1751b4ba43
Merge pull request #6092 from matrix-org/gsouquet/window-dimensions-reflow 2021-05-25 12:00:08 +01:00
Germain Souquet
85a73f2504 Fix copyright header in UIStore file 2021-05-25 11:48:45 +01:00
Germain Souquet
f156c2db15 prevent reflow in app when accessing window dimensions 2021-05-25 10:28:43 +01:00
Germain Souquet
2710062df7 Create a UIStore to track important data
This helper should hold data related to the UI and access save in a smart to avoid performance pitfalls in other parts of the application
2021-05-25 10:28:09 +01:00
Michael Telatynski
63ae84a72e Wire space switch shortcut via dispatcher to prevent app load explosion due to skinning 2021-05-24 18:23:04 +01:00
Germain Souquet
b5295b03ce Trigger join room actions properly 2021-05-24 14:34:06 +01:00
Robin Townsend
f34d61cf5d Merge branch 'develop' into improved-forwarding-ui 2021-05-21 08:15:09 -04:00
Michael Telatynski
e984a4f0cd rejig the code to make types happy 2021-05-20 20:12:28 +01:00
Michael Telatynski
073127aa3c Fix handling of via servers for suggested rooms 2021-05-20 18:47:12 +01:00
Germain Souquet
229c4b98b4 use userGroups cached value to avoid re-render 2021-05-20 18:02:03 +01:00
Germain Souquet
83e2461155 call matches with normalized name 2021-05-20 10:57:20 +01:00
Germain Souquet
66ffaf945f Cache normalized room name 2021-05-20 10:43:57 +01:00
Jaiwanth
bf2d26ef21 Modify to navigate only on notification dots click 2021-05-20 11:23:00 +05:30
Robin Townsend
678b298bab Merge branch 'develop' into improved-forwarding-ui 2021-05-19 12:39:48 -04:00
Germain
6170403c10
Depile encrypted events to find the most suitable one for preview (#6056) 2021-05-19 13:25:52 +01:00
Michael Telatynski
a9d0699488
Merge pull request #6062 from matrix-org/t3chguy/fix/17280
Show DMs in space for invited members too, to match Android impl
2021-05-19 12:41:46 +01:00
Michael Telatynski
e18120f412 Show DMs in space for invited members too, to match Android impl 2021-05-19 08:55:56 +01:00
Travis Ralston
ec7c1ab9f0
Revert "Try putting room list handling behind a lock" 2021-05-18 15:40:09 -06:00
Germain Souquet
0e221ae548 Start decryption process if needed 2021-05-18 16:24:38 +01:00
Travis Ralston
6ccb0d487a Merge branch 'develop' into travis/msc2873 2021-05-17 16:27:20 -06:00
Travis Ralston
3308368ac6
Merge pull request #5960 from matrix-org/travis/msc2876
Support UI for MSC2762: Widgets reading events from rooms
2021-05-17 16:26:53 -06:00
Robin Townsend
64e828d069 Merge branch 'develop' into improved-forwarding-ui 2021-05-16 08:13:59 -04:00
Michael Telatynski
1b8402f39c
Merge pull request #6042 from matrix-org/t3chguy/fix/17304
Update space order field validity requirements to match msc update
2021-05-14 23:19:52 +01:00
Michael Telatynski
a48d786547 Update space order field validity requirements to match msc update 2021-05-14 22:59:03 +01:00
Travis Ralston
89933d779c Merge branch 'develop' into travis/msc2873 2021-05-14 14:22:53 -06:00
Travis Ralston
98b2e120a7 Merge branch 'develop' into travis/msc2876 2021-05-14 14:09:57 -06:00
Travis Ralston
01491f4cba
Merge pull request #6024 from matrix-org/travis/roomlist-corruption
Try putting room list handling behind a lock
2021-05-14 11:06:19 -06:00
Travis Ralston
336904cef8
Apply suggestions from code review
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-05-14 11:05:49 -06:00
Germain Souquet
a37f415a21 Do not eagerly decrypt breadcrumb rooms 2021-05-13 14:26:22 +01:00
Travis Ralston
deab424c93 Appease the linter 2021-05-12 21:19:31 -06:00
Travis Ralston
9beb2b8d78 Try putting room list handling behind a lock
Some of the logs relating to room list corruption appear to be badly timed race conditions so we'll try to linearize them here.
2021-05-12 21:15:17 -06:00
Travis Ralston
f98eee318e Fill out fields for MSC2873 values
As required by https://github.com/matrix-org/matrix-widget-api/pull/36
2021-05-12 14:10:02 -06:00
Germain
91133ed35b
Prioritise and reduce the amount of events decrypted on application startup (#5980) 2021-05-12 12:19:53 +01:00
Germain Souquet
da1df70557 Improve comments and explainer for new decryption approach 2021-05-11 10:18:53 +01:00
Šimon Brandner
1b877f2b7c
Make SpaceTreeLevelLayoutStore into a singleton
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-11 11:16:14 +02:00
Šimon Brandner
4115fd8695
Rewrite SpaceTreeLevelLayoutStore to save paths
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-11 11:13:13 +02:00
Jaiwanth
3e8863fc9a Adjust behaviour for the home space 2021-05-11 13:03:45 +05:30
Šimon Brandner
965af1a642
Initial SpaceTreeLevelLayoutStore implementation
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-11 08:08:02 +02:00
Jaiwanth
1974d47e4e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into spaces-jump-to-room 2021-05-11 11:24:35 +05:30
Jaiwanth
07a952a1bb
Update src/stores/SpaceStore.tsx
Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-11 11:01:28 +05:30
Jaiwanth
14f94c3883
Remove excessive null check
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-05-11 10:41:31 +05:30
Robin Townsend
c39d9649ba Merge branch 'develop' into improved-forwarding-ui 2021-05-10 13:38:02 -04:00
Germain Souquet
17f4945323 Merge branch 'develop' into gsouquet/cache-decrypt 2021-05-10 17:34:44 +01:00
Germain Souquet
f1a6f6fd7f make breadcrumb room events decryption more idiomatic 2021-05-10 15:48:39 +01:00
Robin Townsend
7fa81766db Remove old forwarding code
This has been replaced by ForwardDialog.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-08 21:11:06 -04:00
Germain Souquet
5bd4120920 Decrypt breadcrumb events for better UX 2021-05-07 12:58:37 +01:00
Michael Telatynski
f0e61e6286 short circuit automatic switch to related space behaviour and fix tests 2021-05-07 11:08:18 +01:00
Michael Telatynski
6137162786 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17044.1
 Conflicts:
	src/stores/room-list/RoomListStore.ts
2021-05-07 10:40:07 +01:00
Michael Telatynski
4079b03ae0 Bring back filter all spaces behaviour 2021-05-07 10:39:35 +01:00
Michael Telatynski
9518e4d415 Guard all isSpaceRoom calls behind the labs flag 2021-05-05 23:59:07 +01:00
Michael Telatynski
68210b1415
Merge pull request #5963 from matrix-org/t3chguy/fix/17119
Update space ordering behaviour to match updates in MSC
2021-05-05 22:26:45 +01:00
Michael Telatynski
202dfd4521
Merge pull request #5976 from matrix-org/t3chguy/fix/17153
Improve performance of search all spaces and space switching
2021-05-05 22:13:05 +01:00
Michael Telatynski
2b703e8574 tweak code style 2021-05-05 17:30:14 +01:00
Michael Telatynski
01fa25f3fa
Merge pull request #5968 from matrix-org/t3chguy/fix/17044
Only aggregate DM notifications on the Space Panel in the Home Space
2021-05-05 16:35:07 +01:00
Michael Telatynski
7f396bedd0 add comment 2021-05-05 15:59:02 +01:00
Michael Telatynski
4279e99e4c Improve performance of search all spaces and space switching 2021-05-05 15:29:04 +01:00
Jaiwanth
49b61d512f Replicate same behaviour for the home space 2021-05-05 13:46:40 +05:30
Jaiwanth
d3fc047b58 Handle home space 2021-05-05 13:24:06 +05:30
Jaiwanth
bcd1005e3c Check truthiness of space 2021-05-05 13:01:14 +05:30
Jaiwanth
73b9ad41da Navigate to room with maximum notifications when clicked on already selected space 2021-05-05 12:38:44 +05:30
Michael Telatynski
2bf931b9d3
Merge pull request #5945 from matrix-org/t3chguy/fix/17085
Fix newly joined room appearing under the wrong space
2021-05-04 21:57:43 +01:00
Michael Telatynski
69604480fd Add comment 2021-05-04 21:17:15 +01:00
Michael Telatynski
a70be45b6e Experiment switching the Home Space out for an All rooms space 2021-05-04 18:26:49 +01:00
Michael Telatynski
48237949ad Only aggregate DM notifications on the Space Panel in the Home Space 2021-05-04 16:44:29 +01:00
Michael Telatynski
ac61c8eca8 Adhere to updated sort order for space children 2021-05-04 12:27:27 +01:00
Michael Telatynski
e9f59ed093
Merge pull request #5943 from matrix-org/t3chguy/fix/17082
Sort rooms in the add existing to space dialog based on recency
2021-05-04 10:57:23 +01:00
Travis Ralston
903cc77f39 Appease the linter 2021-05-03 21:53:23 -06:00
Travis Ralston
e04490284d Support UI for MSC2876: Widgets reading events from rooms
MSC: https://github.com/matrix-org/matrix-doc/pull/2876
Fixes https://github.com/vector-im/element-web/issues/15747
Requires https://github.com/matrix-org/matrix-widget-api/pull/34
2021-05-03 21:50:25 -06:00
Michael Telatynski
8dbcc85249
Merge pull request #5944 from matrix-org/t3chguy/fix/17043
Inhibit sending RR when context switching to a room
2021-04-30 15:13:18 +01:00
Michael Telatynski
0008ef7ab1
Merge pull request #5942 from matrix-org/t3chguy/fix/16998
Make the text filter search all spaces instead of just the selected one
2021-04-30 12:53:38 +01:00
Šimon Brandner
5913203dc6
Merge branch 'develop' into fix-indent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-29 20:08:14 +02:00
Šimon Brandner
232b87a3b4
Improve formatting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-29 19:57:02 +02:00
Michael Telatynski
286463606c Spaces fix edge cases around automatic space switching around room navigation 2021-04-29 13:52:48 +01:00
Michael Telatynski
7552801103 Room List respect the prefilter for new rooms 2021-04-29 09:48:23 +01:00
Michael Telatynski
e390c3c732 Inhibit sending RR when context switching to a room 2021-04-29 09:37:21 +01:00
Michael Telatynski
bed52319bc Sort rooms in the add existing to space dialog based on recency 2021-04-28 23:39:24 +01:00
Michael Telatynski
efb9b71900 Make the text filter search all spaces instead of just the selected one 2021-04-28 23:18:42 +01:00
Michael Telatynski
08e0f15006
Merge pull request #5936 from matrix-org/t3chguy/fix/17084
Fix joining room using via servers regression
2021-04-28 17:09:22 +01:00
Michael Telatynski
27731ac25b tidy 2021-04-28 09:07:02 +01:00
Michael Telatynski
5966fade0b Fix joining room using via servers regression 2021-04-28 09:04:02 +01:00
Travis Ralston
c2bcdae8a9 Switch global var to the store for easier debugging 2021-04-27 23:04:49 -06:00
Šimon Brandner
46bfbbadf9
Enable indent rule and fix indent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 17:23:27 +02:00
J. Ryan Stinnett
dd8abb0206
Merge pull request #5912 from matrix-org/jryans/convert-flow-to-ts
Convert some Flow-typed files to TypeScript
2021-04-27 13:44:47 +01:00
Michael Telatynski
f18a24025a
Merge branch 'develop' into t3chguy/fix/17022 2021-04-27 11:16:02 +01:00
Michael Telatynski
62f8c9aab9
Merge pull request #5924 from matrix-org/t3chguy/fix/17069
Disable spaces context switching for when exploring a space
2021-04-27 09:45:58 +01:00
J. Ryan Stinnett
cddcedcce2 Merge remote-tracking branch 'origin/develop' into jryans/convert-flow-to-ts 2021-04-26 15:57:28 +01:00
J. Ryan Stinnett
25e4feeb38 Add more types in WidgetEchoStore 2021-04-26 15:38:43 +01:00
Travis Ralston
ddb8947c15
Merge pull request #5897 from matrix-org/travis/error-states
Improve message error states
2021-04-26 08:16:26 -06:00
Michael Telatynski
751568cef2 Disable spaces context switching for when exploring a space 2021-04-26 14:55:11 +01:00
J. Ryan Stinnett
b8a915bb76 Tweak private / underscores for fields and methods 2021-04-26 14:02:53 +01:00
Michael Telatynski
203425c8de Test and fix space store wrongly treating room invites as space invites 2021-04-26 08:37:45 +01:00
Michael Telatynski
3bb6edbda7 Fix accepting invite edge case where it wouldn't show the newly joined space 2021-04-25 09:24:26 +01:00
Michael Telatynski
98851f8e64 Text space switching behaviour and fix invalid space edge case 2021-04-24 11:32:55 +01:00
Michael Telatynski
da46e90896 Fix SpaceStore reset behaviour 2021-04-24 11:32:12 +01:00
Michael Telatynski
f85d3643ee Test and fix subspace invite receipt behaviour 2021-04-24 11:31:52 +01:00
Travis Ralston
82119ad595 Merge branch 'develop' into travis/error-states 2021-04-23 15:53:37 -06:00
J. Ryan Stinnett
3d41b48543 Check for null room in VisibilityProvider
Hopefully fixes https://github.com/vector-im/element-web/issues/16898
2021-04-23 17:27:20 +01:00
J. Ryan Stinnett
2344ddd164 Merge remote-tracking branch 'origin/develop' into jryans/convert-flow-to-ts 2021-04-23 17:19:52 +01:00
J. Ryan Stinnett
d7e6f4b4b5 Add basic types 2021-04-23 17:05:50 +01:00
J. Ryan Stinnett
31a28b1a9e Update extensions for some files with types
This migrates one bucket of files using some amount of Flow typing to mark them
as TypeScript instead. The remaining type errors are fixed in subsequent
commits.
2021-04-23 16:05:30 +01:00
Michael Telatynski
f5ab75cfdd Fix automatic space switching behaviour to prioritise canonical parents 2021-04-23 14:45:34 +01:00
Germain
65d55bd0d9
Merge pull request #5908 from matrix-org/gsouquet-messagepreview-nodom
Remove reliance on DOM API to generated message preview
2021-04-23 14:37:19 +01:00
Michael Telatynski
320ff7b870 Fix invites relating to a space not showing in the space 2021-04-23 13:41:42 +01:00
Michael Telatynski
86a30a2ad5 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17022 2021-04-23 10:05:45 +01:00
Michael Telatynski
1075756929 add more tests 2021-04-23 09:55:30 +01:00
Germain Souquet
2b6551d06a Remove reliance on DOM API to generated message preview 2021-04-22 16:17:53 +01:00
Michael Telatynski
ba9cfa0942
Merge pull request #5902 from matrix-org/t3chguy/fix/17020
Show invites to spaces at the top of the space panel
2021-04-22 14:32:48 +01:00
Michael Telatynski
3fb4b6258a
Merge pull request #5899 from matrix-org/t3chguy/spaces-stability
Improve edge cases with spaces context switching
2021-04-22 14:30:35 +01:00
Michael Telatynski
e219fe082a Tweak context switching edge case for space invites 2021-04-22 12:08:54 +01:00
Michael Telatynski
7efd4a43a5 Show space invites at the top of the space panel 2021-04-22 12:07:58 +01:00
Michael Telatynski
60ef657f64 Properly hide spaces from the room list 2021-04-22 12:07:58 +01:00
Michael Telatynski
28fa1cb44c Reset space contexts as some users may have loops stuck in their local storage 2021-04-22 09:05:02 +01:00
Michael Telatynski
b64b956aa4 when automatically switching space to match room fall back to the home space 2021-04-22 08:39:16 +01:00
Michael Telatynski
ec0612f70d Fix spaces notification dots wrongly including upgraded (hidden) rooms 2021-04-22 08:31:26 +01:00
Michael Telatynski
e1ba04716e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spaces-stability
 Conflicts:
	src/stores/SpaceStore.tsx
2021-04-22 08:24:19 +01:00
Michael Telatynski
ee80c27b2b Improve edge cases with spaces context switching 2021-04-22 08:22:11 +01:00
Travis Ralston
4be9c51dad Move all the RED_EXCLAMATION badges to a single definition 2021-04-21 16:43:25 -06:00
Michael Telatynski
8373b0e69c
Merge pull request #5893 from matrix-org/t3chguy/fix/16978
Fix spaces filtering sometimes lagging behind or behaving oddly
2021-04-21 09:20:18 +01:00
Michael Telatynski
bae47bbd79
Merge pull request #5894 from matrix-org/t3chguy/fix/17026
Fix issue with spaces context switching looping and breaking
2021-04-21 09:11:26 +01:00
Michael Telatynski
ecd9b8d6de Fix issue with spaces context switching looping and breaking 2021-04-21 09:01:22 +01:00
Michael Telatynski
1507f64f2b Fix spaces filtering sometimes lagging behind or behaving oddly 2021-04-21 08:52:56 +01:00
Šimon Brandner
9b81f5b4a0
Add a comment
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-20 16:11:34 +02:00
Šimon Brandner
3adb2635ba
Revert "Remove unnecessary check"
This reverts commit 08c0f0a67e.

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-20 15:40:32 +02:00
Michael Telatynski
ace8d59a2a Fix Spaces NPE when a room with no tags gains its first tag 2021-04-20 13:12:28 +01:00
Šimon Brandner
4344ff9097
Update src/stores/SpaceStore.tsx
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-04-20 13:31:50 +02:00
Šimon Brandner
d4ca087c2e
Make getLastViewedRoomsStorageKey() make sense
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-20 13:24:23 +02:00
Šimon Brandner
1934c4a32f
Add getLastViewedRoomsStorageKey()
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-20 12:39:11 +02:00
Šimon Brandner
f9292c364c
Check if we are joined
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-20 12:25:56 +02:00
Šimon Brandner
08c0f0a67e
Remove unnecessary check
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-20 12:22:25 +02:00
Šimon Brandner
a3d0ccf306
Merge branch 'develop' into spaces/context-switching 2021-04-20 12:06:59 +02:00
Michael Telatynski
6127669c53
Merge pull request #5882 from matrix-org/t3chguy/fix/17002
Trigger lazy loading when filtering using spaces
2021-04-19 19:25:15 +01:00
Michael Telatynski
344e4b6c5b Trigger lazy loading when filtering using spaces
so that the filtered DMs are correct
2021-04-19 16:15:24 +01:00
Travis Ralston
f955f33071 Merge branch 'develop' into travis/voice/countdown 2021-04-16 10:00:11 -06:00
David Baker
d39b7175f7 Don't include invisible rooms in notify summary
This could cause rogue title bar natifications if you had invisible rooms
2021-04-16 15:31:01 +01:00
Travis Ralston
0677cf866c Cap recording length, and warn at 10s remaining
See diff for details. Note that this introduces an "Uploading" state which is not currently used.

At the moment, if a user hits the maximum time then their recording will be broken. This is expected to be fixed in a future PR.
2021-04-14 21:15:06 -06:00
Travis Ralston
3cafed478c Run voice recording updates through a dedicated store 2021-04-14 20:11:34 -06:00
Michael Telatynski
bf33775a14 Fix space store wrongly switching to a non-space filter 2021-04-12 11:45:22 +01:00
Travis Ralston
3c25979520
Merge pull request #5824 from robintown/ignore-punctuation
Ignore punctuation when filtering rooms
2021-04-08 20:10:08 -06:00
Travis Ralston
479df8ac5f Clarify docs 2021-04-02 19:35:10 -06:00
Travis Ralston
343ce3b502 Make log spam more quiet 2021-04-01 00:02:05 -06:00
Travis Ralston
746856ed10 Appease the linter 2021-03-31 23:40:25 -06:00
Travis Ralston
70db749430 Restabilize room list ordering with prefiltering on spaces/communities
Fixes https://github.com/vector-im/element-web/issues/16799

This change replaces the "relative priority" system for filters with a kind model. The kind is used to differentiate and optimize when/where a filter condition is applied, resulting in a more stable ordering of the room list. The included documentation describes what this means in detail.

This also introduces a way to inhibit updates being emitted from the Algorithm class given what we're doing to the poor thing will cause it to do a bunch of recalculation. Inhibiting the update and implicitly applying it (as part of our updateFn.mark()/trigger steps) results in much better performance.

This has been tested on my own account with both communities and spaces of varying complexity: it feels faster, though the measurements appear to be within an error tolerance of each other (read: there's no performance impact of this).
2021-03-31 23:36:36 -06:00
Robin Townsend
b13dae1fc6 Ignore punctuation when filtering rooms
Signed-off-by: Robin Townsend <robin@robin.town>
2021-03-31 22:45:53 -04:00
Germain Souquet
3f33060cdd increase default visible tiles for room sublists 2021-03-31 11:15:16 +01:00
J. Ryan Stinnett
3a09c22173
Merge pull request #5812 from matrix-org/jryans/cancel-security-key
Tweak security key error handling
2021-03-29 17:58:11 +01:00
J. Ryan Stinnett
02548cf743 Tweak security key error handling
This reworks error handling of "use security key" so we stop the overall
operation when cancelling access (instead of just the immediate prompt). In
addition, flowing the error to outer catch block also handles resetting state to
re-display the initial verification choices.

Fixes https://github.com/vector-im/element-web/issues/15584
2021-03-26 18:01:03 +00:00
Šimon Brandner
d68afcc4ce
Use else if
Maybe it looks a little nicer, I don't know

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-26 13:52:41 +01:00
Šimon Brandner
a707524aad
Delete comment
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-26 13:49:01 +01:00
Šimon Brandner
f62e2c0042
Use compound keys
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-26 13:44:51 +01:00
Šimon Brandner
f64008e239
Check if room is defined
Sometimes it isn't and that leads to errors. We can't use ? here because we also use !

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-26 13:39:16 +01:00
Michael Telatynski
aff05eff48 Fix suggested room vanishing when you peek it 2021-03-26 11:48:31 +00:00
Šimon Brandner
65ef2b845e
Go to /#/home if there is no saved room
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-26 08:18:49 +01:00
Šimon Brandner
7e425ce939
Empty object if nothing saved
This isn't nice but I'll rework this soon anyway

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-26 08:18:49 +01:00
Šimon Brandner
efb8c89433
Don't save if isSpaceRoom()
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-26 08:18:42 +01:00
Šimon Brandner
c26da1bce6
Use this.activeSpace
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-26 07:58:09 +01:00
Šimon Brandner
e39f7caf59
Don't export as we don't need to
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-26 07:55:52 +01:00
Šimon Brandner
2dcb60b489
Move persisting of last viewed into SpaceStore
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-26 07:54:27 +01:00
Šimon Brandner
67dcb3a448
If no roomId was saved go to space home
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-25 20:51:21 +01:00
Šimon Brandner
ef3d87f8e8
First implementation of context switching
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-25 20:44:15 +01:00
Michael Telatynski
1b22cc8f6d delint 2021-03-25 17:41:26 +00:00
Michael Telatynski
a2fe964a31 Fix case where room list did not show DM when user joined space after filtering 2021-03-25 17:37:39 +00:00
Michael Telatynski
a61f4c1811 Auto-select space if joined whilst being viewed 2021-03-24 20:01:21 +00:00
Michael Telatynski
56dbd5f628 Remove unused autoJoin prop and move viaServers logic into RVS
this fixes the issue where autoJoining ignored viaServers
2021-03-24 16:45:53 +00:00
Michael Telatynski
d873791369 update comments 2021-03-24 14:01:24 +00:00
Michael Telatynski
796bfd851d Fix left spaces not disappearing from the space panel 2021-03-22 17:47:48 +00:00
Michael Telatynski
128c7db28e
Merge pull request #5777 from matrix-org/t3chguy/spaces4.9
Spaces improve creation journeys
2021-03-22 13:24:10 +00:00
David Baker
8a765cf67a
Merge pull request #5770 from matrix-org/dbkr/jitsi_display_name
Fix username showing instead of display name in Jitsi widgets
2021-03-19 13:41:35 +00:00
Michael Telatynski
2b4c670b89 Fix favourites not showing up in home until a refresh 2021-03-19 13:20:30 +00:00
Michael Telatynski
c6f6d24b32 Iterate space creation and previews 2021-03-19 13:20:30 +00:00
David Baker
4a734ef70b Clear displayname / vatar if they're unset 2021-03-19 11:29:14 +00:00
Travis Ralston
1d43c8b791 Remove forgotten rooms from the room list once forgotten
Fixes https://github.com/vector-im/element-web/issues/15559

This isn't exactly perfect as an implementation: if the user refreshes immediately after forgetting then there is a good chance the room re-appears because of the sync accumulator. At the very least this change makes it so in *most* cases the room goes away, which is probably good enough until https://github.com/vector-im/element-web/issues/14038 can be implemented properly.
2021-03-18 23:28:59 -06:00
David Baker
2b608aa919
Remove blank line 2021-03-17 19:18:32 +00:00
David Baker
d95955d90b
Merge branch 'develop' into dbkr/jitsi_display_name 2021-03-17 19:17:52 +00:00
David Baker
f6a87386bc Fix username showing instead of display name in Jitsi widgets
If you opened element and entered a jitsi conference straight away
in the room you landed in, your jitsi display name would be your
matrix username rather than your display name. This was because
OwnProfileStore was still busy fetching your profile from the server
while the room, and therefore jitsi widget, was rendered.

Blocking these widgets loading on this profile fetch completing isn't
really an option, so store the profile data in localstorage and seed
OwnProfileStore with the values from there.

Bonus: the name in the top left will now be your display name as
soon as the app is loaded, rather than being your username for the
first several seconds after you load the app.

Fixes https://github.com/vector-im/element-web/issues/16577
2021-03-17 19:09:43 +00:00
Travis Ralston
a9a4bd50ca Merge branch 'develop' into travis/media-customization 2021-03-11 08:37:49 -07:00
J. Ryan Stinnett
6a939c4de8
Merge pull request #5727 from matrix-org/matthew/rework-cross-signing-login
Rework cross-signing login flow
2021-03-11 12:53:55 +00:00
Travis Ralston
1ac12479ca Convert cases of mxcUrlToHttp to new media customisation 2021-03-10 12:32:18 -07:00
J. Ryan Stinnett
0583ea6a25 Ignore to-device decryption in the room list store
This avoids meaningless warnings about "unknown" rooms.
2021-03-10 12:11:48 +00:00
Michael Telatynski
98338f1505
Merge pull request #5736 from matrix-org/t3chguy/spaces4.5
Spaces suggested rooms support
2021-03-10 10:56:17 +00:00
Michael Telatynski
e6370a970b Tweak call handler stuff to not explode the room list on unsupported servers 2021-03-09 14:03:58 +00:00
Michael Telatynski
1cfeb36927 Update suggested room on join 2021-03-09 13:41:37 +00:00
Matthew Hodgson
41c87c7570 remove obsolete comment 2021-03-09 13:35:45 +00:00
Matthew Hodgson
d388f877b4 add PHASE_LOADING to SetupEncryptionStore to avoid flashing cross-signing setup 2021-03-08 23:28:44 +00:00
Matthew Hodgson
9d99b2f239 remove errand whitespace 2021-03-08 17:59:10 +00:00
Michael Telatynski
6a5efad142 Show suggested rooms from the selected space 2021-03-08 15:52:21 +00:00
David Baker
d71999114b
Merge pull request #5707 from matrix-org/dbkr/audiostream
Option for audio streaming
2021-03-08 11:50:45 +00:00
Matthew Hodgson
997d6e1281 lint 2021-03-08 05:08:01 +00:00
Matthew Hodgson
c02d03cc5b Merge branch 'develop' of git+ssh://github.com/matrix-org/matrix-react-sdk into develop 2021-03-08 04:57:10 +00:00
Matthew Hodgson
d477f964d2 only prompt to verify if we have an MSK or we have devices to verify against 2021-03-08 04:49:59 +00:00
Michael Telatynski
ab4220b20d Defer auto-joining within spaces and switch to using suggested 2021-03-04 13:04:58 +00:00
Michael Telatynski
d1a75885a7 Protect onAction dispatch handler on the SpaceStore with Spaces disabled 2021-03-02 15:35:02 +00:00
David Baker
20e57d15fd Option for audio streaming 2021-03-02 15:20:54 +00:00
Michael Telatynski
c10512fd56 Initial SpaceRoomView work 2021-03-01 18:53:11 +00:00
Michael Telatynski
bfe3d648e2
Update src/stores/room-list/algorithms/Algorithm.ts
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-02-26 22:08:36 +00:00
Michael Telatynski
f21aedc6cf Add Space Panel with Room List filtering 2021-02-26 10:41:26 +00:00
Michael Telatynski
7030c636f0 Initial Space Store for keeping track of space hierarchies from sync 2021-02-25 16:36:35 +00:00
Michael Telatynski
79daf615e4 First special treatment of space-rooms 2021-02-19 14:20:57 +00:00
Michael Telatynski
6b3f05a3cd Switch RoomListStore to only including the filtered subset
Without this it'd include notification counts from Community B when Community A is selected and such.
2021-02-19 14:10:36 +00:00
Michael Telatynski
63d95706e9 Create setHasDiff helper and use it
The usage here is identical to how it'll work in Spaces
2021-02-19 12:58:23 +00:00
Michael Telatynski
8fc244452c Prevent error being thrown so that we can throw our own better one 2021-02-18 18:06:26 +00:00
Travis Ralston
64974eb3ee
Merge pull request #5661 from matrix-org/travis/clear-preview
Clear message previews when the maximum limit is reached for history
2021-02-18 07:31:54 -07:00
Travis Ralston
47d73bef57 Clear message previews when the maximum limit is reached for history 2021-02-17 22:36:26 -07:00
David Baker
6130bdf0d2 Use creation content to signal virtual-ness
This makes things a lot simpler.
2021-02-17 18:51:21 +00:00
David Baker
e787d11c73 Merge remote-tracking branch 'origin/develop' into dbkr/virtual_rooms_v2 2021-02-16 19:41:54 +00:00
David Baker
79455d99b4 Unused import 2021-02-15 19:38:17 +00:00
David Baker
89b2dae035 Send onNewInvitedRoom via VisibilityProvider 2021-02-15 18:13:13 +00:00
David Baker
196507a730 VoIP virtual rooms, mk II
Does a thirdparty protocol lookup to the homeserver to get the
corresponding native/virtual user for a matrix ID. Stores the
mappings in room account data. Involves some slightly nasty workarounds
for that fact that room account data has no local echo.
2021-02-12 20:55:54 +00:00
Jason Robinson
6ccce7142c Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-03 22:35:22 +02:00
J. Ryan Stinnett
e4629878bc Lock widget room ID when added
This changes the widget room ID available to widget URL templates so that it's
locked to the room the widget was added in.

Fixes https://github.com/vector-im/element-web/issues/16337
2021-02-02 14:36:44 +00:00
J. Ryan Stinnett
2c313e0c5e Add managed hybrid call widgets when supported
If your homeserver is configured with an experiment `widget_build_url`, this
will take over the functionality of the call buttons and turn them into a
general widget installer.
2021-01-29 14:45:25 +00:00
Travis Ralston
d6dbe5596a
Merge pull request #5581 from matrix-org/travis/widgets/sticker-picker
Allow stickerpickers the legacy "visibility" capability
2021-01-28 07:46:17 -07:00
Travis Ralston
61f6fa0633
Merge pull request #5582 from matrix-org/travis/widgets/fix-jitsi-unpin
Remove check that prevents Jitsi widgets from being unpinned
2021-01-27 14:59:34 -07:00
Travis Ralston
c1b33d3e2c Fix Jitsi widgets causing localized tile crashes
Seems to be that as part of the layout work the timing sequence for when `.getRoom().widgets` will work changed. We can get around this with `initIfNeeded` which will no-op in the worst case.

This also includes a copy change to make ended conferences stop lying about where to find the widget. This is work towards https://github.com/vector-im/element-web/issues/15739
2021-01-27 14:40:04 -07:00
Travis Ralston
08b067fd68 Remove check that prevents Jitsi widgets from being unpinned
Later in the code we do a conditional on the widget type to auto-pin the widget, so we don't need this one to force the widget higher.

Fixes https://github.com/vector-im/element-web/issues/16280
2021-01-27 14:31:48 -07:00
Travis Ralston
edb363b751 Allow stickerpickers the legacy "visibility" capability
Fixes https://github.com/vector-im/element-web/issues/16237
2021-01-27 14:22:55 -07:00
J. Ryan Stinnett
84b1f2e6c6 Resolve typing errors after TypeScript upgrade 2021-01-27 12:42:37 +00:00
Travis Ralston
d3281db2bf Update widgets in the room upon join 2021-01-22 17:49:18 -07:00
David Baker
f703383ab6
Merge pull request #5560 from matrix-org/dbkr/voip_user_mapper
Add VoIP user mapper
2021-01-22 14:12:08 +00:00
Travis Ralston
f023fc50e2
Update src/stores/widgets/WidgetLayoutStore.ts
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-01-21 13:22:44 -07:00
David Baker
0a90c982c7 Add VoIP user mapper
The accompanying element-web PR with the config documentation should
explain what this is & why. Internally, this breaks the assumption
that call.roomId is the room that the call appears in for the user.
call.roomId may now be a 'virtual' room while the react SDK actually
displays it in a different room. React SDK always stores the calls
under the user-facing rooms, and provides a function to get the
user-facing room for a given call.
2021-01-21 19:20:35 +00:00
Travis Ralston
29780d902c Try to reduce WidgetStore causing downstream problems 2021-01-20 14:44:30 -07:00
Travis Ralston
f8fe454c59 Replace looping resizer with actual math 2021-01-20 14:42:24 -07:00
Travis Ralston
ab51404421 Appease the tests? 2021-01-18 21:07:44 -07:00
Travis Ralston
6d770cb4d1 Appease the linter 2 2021-01-18 21:00:47 -07:00
Travis Ralston
6227d3c183 Appease the linters 2021-01-18 20:53:15 -07:00
Travis Ralston
04d1f5dd28 Implement a "Copy my layout to the room" button 2021-01-18 20:42:21 -07:00
Travis Ralston
5c393cc2d0 Add in some local echo support to make changes appear faster 2021-01-18 20:29:51 -07:00
Travis Ralston
7ff76b2500 Don't forget to run cleanup 2021-01-18 20:28:09 -07:00
Travis Ralston
1768d6ea5f Move all widget pinning logic to the WidgetLayoutStore 2021-01-18 20:26:47 -07:00
Travis Ralston
0d29d15a46 Support room-defined height as well
Much like widget widths, it is acceptable for us to forget what everyone's height was previously at.
2021-01-18 19:27:11 -07:00
Travis Ralston
cfb583d193 Calculate widget widths in the WidgetLayoutStore
Note that this ditches all previously set width values, however this is probably acceptable for now. Trying to remain backwards compatible gets tricky on top of already tricky code, and the impact of Element forgetting widths is not as severe as forgetting which widgets were/are pinned.
2021-01-18 18:50:36 -07:00
Travis Ralston
0001e1e684 Support initial ordering and calculation for widgets by layout 2021-01-18 17:41:42 -07:00
Travis Ralston
4ee29d4e63 Split out ready states of stores to its own store 2021-01-18 17:41:17 -07:00
Travis Ralston
83fb698bbc
Merge pull request #5527 from matrix-org/travis/widget-nav
Wire up MSC2931 widget navigation
2021-01-18 09:09:32 -07:00
J. Ryan Stinnett
8a341446aa Use room-specific listeners for community prototype
Similar to message previews, this changes another area to use room-specific
listeners for better performance and avoiding warnings.
2021-01-15 14:34:56 +00:00
J. Ryan Stinnett
729356394e Use room-specific listeners for message previews
This should be a bit faster (since we now only notify one tile instead of all
for each update). It also resolves the max listener warning.

Fixes https://github.com/vector-im/element-web/issues/15121
2021-01-15 14:21:21 +00:00
Jason Robinson
d6af5b3bbd WIP minimize 2021-01-14 12:20:42 +02:00
Jason Robinson
d4a58bdb2a WIP minimize 2021-01-14 11:53:20 +02:00
Travis Ralston
7e0cf5c783 Wire up MSC2931 widget navigation
Fixes https://github.com/vector-im/element-web/issues/16006
**Requires https://github.com/matrix-org/matrix-widget-api/pull/27**
2020-12-29 12:35:48 -07:00
Travis Ralston
b870de14ed
Merge pull request #5488 from matrix-org/travis/chat-effects-widgets
Run chat effects on events sent by widgets too
2020-12-11 21:52:24 -07:00
Travis Ralston
c80ccf6386 Remove unused import 2020-12-11 08:27:46 -07:00
Travis Ralston
b6123506d4 Run chat effects on events sent by widgets too 2020-12-10 21:00:37 -07:00
Travis Ralston
10930b8404 Fix being unable to pin widgets
Turns out that we were obliterating the entire store of widgets each time we loaded a widget, which is less than helpful. This commit fixes that.

This commit also improves the cleanup of the pinned event object to remove unpinned widgets, reducing accumulation over time.

Fixes https://github.com/vector-im/element-web/issues/15948
2020-12-10 20:57:20 -07:00
Travis Ralston
d38a6ad1be Add more widget sanity checking
This is for https://github.com/vector-im/element-web/issues/15705

https://github.com/matrix-org/matrix-react-sdk/pull/5459 was unable to track down all the instances of where the issue happens, so this commit tries to do a more complete job.

Specifically, this replaces the getRoomId() function given widgets cannot reliably be referenced by widget ID in this way, and the store has been updated to handle a more unique widget ID for the store (just in case).

Further sanity checking has also been added to ensure that we are at least returning a valid result.
2020-12-02 12:20:59 -07:00
Travis Ralston
5df6932051 Add various amounts of sanity checking for widget pinning
This should also help https://github.com/vector-im/element-web/issues/15705 by either implicitly fixing the problem, causing chaos as described in the issue, or by forcing a crash to identify the problem more easily.
2020-12-01 13:19:51 -07:00
Travis Ralston
bd1de8d45b Require a room ID for WidgetStore's pinned widget contracts
This should alleviate https://github.com/vector-im/element-web/issues/15705 from happening, though the cause is still unknown.

Requiring a room ID is safe for this because only room widgets can be pinned, and widget IDs are not globally unique which means from a logical standpoint the contract still makes sense here.
2020-12-01 13:05:48 -07:00
Travis Ralston
f4979065e4
Merge pull request #5445 from matrix-org/travis/hide-rooms
Make it possible in-code to hide rooms from the room list
2020-11-27 07:07:18 -07:00
Travis Ralston
c2c328e23c Appease the linter 2020-11-26 08:06:48 -07:00
Travis Ralston
b9c57f47b0 Remove example 2020-11-26 08:01:38 -07:00
Travis Ralston
24f3ecb69a
Merge branch 'develop' into travis/modal-widget-fixes 2020-11-26 08:00:02 -07:00
Travis Ralston
80b93e0843 Mute all updates from rooms that are invisible 2020-11-25 20:03:58 -07:00
Travis Ralston
b9af446c1b Make it possible in-code to hide rooms from the room list
Fixes https://github.com/vector-im/element-web/issues/15745

This was surprisingly easy given the number of errors I remember last time, but here it is. This also includes an over-engineered VisibilityProvider with the intention that it'll get used in the future for things like Spaces and other X as Rooms stuff.
2020-11-25 19:42:57 -07:00
Travis Ralston
c2cb791f7d Appease the linter 2020-11-25 18:58:30 -07:00
Travis Ralston
fc820c4b1a Construct modal widgets in the same way we do any other widget
Fixes https://github.com/vector-im/element-web/issues/15800
2020-11-25 18:51:27 -07:00
Travis Ralston
5da27aed94 Replace the concept of a Widget Security Key with an OIDC state
The security key naming/practice was misguided, so let's call it what it is (a settings key) and abstract away the complexity to a new store.

Fixes https://github.com/vector-im/element-web/issues/15820 while we're here.
2020-11-25 18:39:11 -07:00
Travis Ralston
c91dc55bc1 Make modal widgets static to avoid being destroyed
Fixes https://github.com/vector-im/element-web/issues/15818
2020-11-25 18:35:00 -07:00
Travis Ralston
3780afff7d Fix existing widgets not having approved capabilities for their function
Fixes https://github.com/vector-im/element-web/issues/15827

This also fixes sticker pickers.
2020-11-25 14:40:01 -07:00
Travis Ralston
1db130b8f0
Merge pull request #5440 from matrix-org/travis/openid2
Use the WidgetDriver to run OIDC requests
2020-11-24 09:44:27 -07:00
Travis Ralston
28c78509a1 Use the WidgetDriver to run OIDC requests
Fixes https://github.com/vector-im/element-web/issues/15775
2020-11-23 14:10:14 -07:00
Travis Ralston
da32d9decd Add a customisation point for widget permissions and fix amnesia issues
The "remember my selection" option wasn't working because the `missing` set still included the approved permission. Solution: remove it from `missing`.

The customisation point is to allow forks to change which widgets get which additional capabilities dependent on their own rules.
2020-11-23 11:59:38 -07:00
Travis Ralston
107fa98180 Support arbitrary widgets sticking to the screen + sending stickers
Following https://github.com/matrix-org/matrix-react-sdk/pull/5385, it is now possible for a widget to request these capabilities without being a video conference or sticker picker. This commit actually enables this support for those kinds of widgets.

This commit also fixes an issue in the URL templating where some variables might get set to 'undefined' - this appears to be a scoping issue, so StopGapWidget now stores the definition alongside the superclass. 

Fixes https://github.com/vector-im/element-web/issues/15001
2020-11-20 16:53:15 -07:00
Travis Ralston
dec47a260c Appease the linter 2020-11-19 12:12:00 -07:00
Travis Ralston
21663314ee Minor touchups to the dialog 2020-11-19 11:24:17 -07:00
Travis Ralston
55592d365c Merge branch 'develop' into travis/msc-send-widget-events 2020-11-18 15:57:53 -07:00
Travis Ralston
a212dab84c Developer design a permissions dialog 2020-11-17 20:38:59 -07:00
Travis Ralston
94550546eb Merge branch 'develop' into travis/msc-send-widget-events 2020-11-16 15:08:52 -07:00
Travis Ralston
33b7367d82 Fix room ID handling 2020-11-12 10:36:30 -07:00
Michael Telatynski
36ef9ec341 Update styling of the Analytics toast to try and decrease number of users blindly pressing No 2020-11-09 14:21:45 +00:00
Michael Telatynski
0da23e2cbd Fix copy for call hangup previews 2020-11-03 15:22:23 +00:00
Travis Ralston
fc90531c9f Appease the linter 2020-11-02 21:38:59 -07:00
Travis Ralston
f5cd079a16 Add support for sending/receiving events from widgets
Part of MSC2762: https://github.com/matrix-org/matrix-doc/pull/2762
Requires: https://github.com/matrix-org/matrix-widget-api/pull/9

This is the bare minimum required to send an event to a widget and receive events from widgets. Like the view_room action, this is controlled by a well-known permission key.

**Danger**: This allows widgets to potentially modify room state. Use the permissions with care.
2020-11-02 21:32:49 -07:00
Travis Ralston
e15041bd53 Add a custom widget API action for viewing a different room 2020-11-02 15:21:18 -07:00
Michael Telatynski
997679e648 Fix Widget OpenID Permissions for realsies 2020-10-30 22:12:46 +00:00
Michael Telatynski
bf124c4379 Fix regression with OpenID permissions on widgets 2020-10-30 21:13:01 +00:00
Michael Telatynski
c3a355097d Initial Countly work 2020-10-29 15:57:16 +00:00
Michael Telatynski
17717e27c6 Fix theme variable passed to Jitsi 2020-10-27 11:26:16 +00:00
Michael Telatynski
0004dd4475 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets 2020-10-22 21:40:05 +01:00
Michael Telatynski
5f2058a6a0 Fix WidgetStore wrongly hanging onto old Widget definitions during removal
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-21 16:06:22 +01:00
Michael Telatynski
4e12aeca9e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets
 Conflicts:
	src/components/views/elements/AppTile.js
2020-10-21 12:48:51 +01:00
Michael Telatynski
2b9c2daaf4 Fix auto-pinned widget ordering
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-20 16:07:21 +01:00
Michael Telatynski
b0acae6e77 fix remaining type mismatches
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 21:13:31 +01:00
Michael Telatynski
5ee0262da2 Post-merge tidy up
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 20:56:41 +01:00
Michael Telatynski
bec1d718e0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets
 Conflicts:
	src/components/views/elements/AppTile.js
	src/utils/WidgetUtils.ts
2020-10-19 20:50:16 +01:00
Michael Telatynski
16362440b3 Iterate Modal Widgets
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 20:39:43 +01:00
Michael Telatynski
00b1a03a3e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets
 Conflicts:
	src/@types/global.d.ts
	src/FromWidgetPostMessageApi.js
	src/WidgetMessaging.js
	src/widgets/WidgetApi.ts
2020-10-19 19:46:07 +01:00
Michael Telatynski
5fcdaf66cc Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-19 18:50:02 +01:00
J. Ryan Stinnett
7fe98b4e9d Adjust for new widget messaging APIs
As part of changing to the `events` package, the API surface changed slightly.

Related to https://github.com/vector-im/element-web/issues/15493
2020-10-19 16:42:20 +01:00
Michael Telatynski
744a4abd1c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-19 13:08:17 +01:00
Michael Telatynski
81990d36b5 Fix Jitsi OpenIDC auth
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 10:49:07 +01:00
Michael Telatynski
f198b95579 Iterate PR; tidy and improve widget context menu
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-15 15:24:42 +01:00
Michael Telatynski
a6c81a903c Iterate with new buttons and resize locking
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-15 11:14:48 +01:00
Travis Ralston
edcdd950f7
Merge pull request #5323 from matrix-org/travis/jitsi-popout-fix
Don't supply popout widgets with widget parameters
2020-10-14 16:37:06 -06:00
Travis Ralston
3edb6b2234
Merge pull request #5309 from RinkiyaKeDad/fix-final-10
Renamed TagPanel and TagOrderStore
2020-10-14 16:33:31 -06:00
Travis Ralston
3a88b263c8 Don't supply popout widgets with widget parameters
Fixes https://github.com/vector-im/element-web/issues/15443
2020-10-14 13:54:27 -06:00
Travis Ralston
dccea97762 Fix/clarify boolean logic for reaction previews 2020-10-14 08:56:08 -06:00
Arsh Sharma
49d99c6dc7 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into fix-final-10 2020-10-14 16:58:05 +05:30
Arsh Sharma
f705796477 fixing errors 2020-10-14 16:04:41 +05:30
Michael Telatynski
d36fafd0c6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets
 Conflicts:
	res/css/views/rooms/_AppsDrawer.scss
	src/components/views/elements/AppTile.js
	src/components/views/rooms/AppsDrawer.js
2020-10-14 10:23:44 +01:00
Travis Ralston
f9ac390842 Appease the linter 2020-10-13 14:56:27 -06:00
Travis Ralston
294c35347c Ensure widgets are destroyed cleanly when minimized
Fixes https://github.com/vector-im/element-web/issues/15444 (an artifact of joining a call then minimizing the widget)

Also fixes other issues relating to widgets not loading when being minimized/maximized.
2020-10-13 14:55:44 -06:00
Travis Ralston
40038a6100 Run templating on the popout URL too
Fixes https://github.com/vector-im/element-web/issues/15443
2020-10-13 14:54:02 -06:00
Michael Telatynski
758a4b79ce stash
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 16:18:02 +01:00
Michael Telatynski
a1d25efceb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets
 Conflicts:
	src/components/structures/RoomView.tsx
2020-10-13 13:45:22 +01:00
Michael Telatynski
7be5ff0fe6 First cut of app drawer tiled resizing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 12:29:12 +01:00
Michael Telatynski
37558f1f0d Improve the context menu
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-12 09:51:49 +01:00
RinkiyaKeDad
f5a40eff4b updated TagFilterStore 2020-10-10 18:02:58 +05:30
RinkiyaKeDad
4f8b0afc41 updated TagPanel 2020-10-10 18:00:06 +05:30
Travis Ralston
1af8d96db9 Fix templating for v1 jitsi widgets
Fixes https://github.com/vector-im/element-web/issues/15427
2020-10-09 09:26:52 -06:00
Michael Telatynski
317dc68135 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets
 Conflicts:
	src/components/views/elements/AppTile.js
2020-10-09 08:45:11 +01:00
Travis Ralston
d38b544a42 Use new preparing event for widget communications
Fixes https://github.com/vector-im/element-web/issues/15404

We need to make sure we don't accidentally call the widget before its ready, but we can happily show it once it is loaded/prepared.
2020-10-08 15:35:22 -06:00
Michael Telatynski
b8080a7d2d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-08 13:04:59 +01:00
J. Ryan Stinnett
779e43b8dd
Merge pull request #5296 from matrix-org/jryans/sso-4s-integration
Convert auth lifecycle to TS, remove dead ILAG code
2020-10-07 15:42:42 +01:00