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