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
dc7aad1abf
Revert "Revert "Add support for Posthog Analytics under a labs flag""
...
This reverts commit c5ea253181
2021-08-03 11:55:02 +01:00
c5ea253181
Revert "Add support for Posthog Analytics under a labs flag"
2021-08-03 07:30:02 +01:00
a65b41be63
Merge pull request #6495 from matrix-org/posthog-analytics
...
Add support for Posthog Analytics under a labs flag
2021-08-02 14:46:17 +01:00
42d6afd4b1
Merge pull request #6497 from matrix-org/t3chguy/fix/18093
2021-07-30 12:25:44 +01:00
1c2dc13fa3
factor our observer hook
2021-07-30 12:12:49 +01:00
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
f4ed9aeef1
Add pagination mechanism to SpaceHierarchy based on IntersectionObserver
2021-07-30 11:02:22 +01:00
259627fba2
Clean up SpaceHierarchy
2021-07-30 11:01:49 +01:00
a7c15b2ac0
Fix DialPad and Call Menu buttons not working when a call is fullscreened. ( #6496 )
...
This PR:
* Moves the dialpad and hold/transfer menu buttons into the part of the DOM that's included when a call is fullscreen'd.
* Tweaks `ContextMenu` to allow menu content to be mount as a child of the current component, rather than at the root of the DOM (which was not included in the full-screen'd content).
<!-- Please read https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md before submitting your pull request -->
<!-- Include a Sign-Off as described in https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md#sign-off -->
`Signed-off-by: Andrew Morgan <andrewm@element.io>`
2021-07-29 17:51:27 +01:00
d459dbe700
Refactor Space Hierarchy stuff in preparation for pagination
2021-07-29 17:35:15 +01:00
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
efd8a2f9b0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
...
Conflicts:
src/components/structures/SpaceRoomView.tsx
src/components/views/spaces/SpaceCreateMenu.tsx
src/i18n/strings/en_EN.json
2021-07-29 15:16:53 +01:00
a1ffd240e1
Use .instance pattern
2021-07-29 14:40:18 +01:00
08c883ed07
Update all copy of `subspace` to `space`
2021-07-29 13:02:07 +01:00
56cd0e1c4f
Merge branch 't3chguy/fix/18091' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089
...
Conflicts:
src/components/structures/SpaceRoomDirectory.tsx
2021-07-29 12:52:01 +01:00
6f37e8b223
Use getChildren instead of getSpaceSummary as MSC2946 has moved on
2021-07-29 12:16:59 +01:00
67b8c0a811
remove unused import
2021-07-28 19:33:54 +01:00
ac800ad94d
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093
2021-07-28 19:24:26 +01:00
ed950875e7
Fix space hierarchy not updating when user mutates it
2021-07-28 19:08:59 +01:00
5d9e421de0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091
2021-07-28 17:58:34 +01:00
a5606c72de
Update feedback prompt to match designs
2021-07-28 17:56:57 +01:00
6123ccb2eb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
2021-07-28 17:45:15 +01:00
67ef263940
Refactor SpaceButton to be more reusable and add context menu to Home button
2021-07-28 17:40:33 +01:00
bd7e2dee3d
Merge remote-tracking branch 'origin' into posthog-analytics
2021-07-28 11:13:22 +01:00
1d81bdc6f9
Interface changes and anonymity fixes
2021-07-28 09:37:08 +01:00
9761c38f3d
Merge remote-tracking branch 'upstream/develop' into feature/hidden-rrs
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 18:39:22 +02:00
7733ee2578
Merge pull request #6478 from matrix-org/dbkr/scrollpanel_loop_breaker
...
Fix infinite pagination loop when offline
2021-07-27 13:54:30 +01:00
8104ba936c
Add data-layout to MELS for better CSS structure
2021-07-27 11:30:25 +02:00
e5d538412b
Typo
...
Co-authored-by: Germain <germain@souquet.com>
2021-07-27 09:29:32 +01:00
f20da6d3de
Fix infinite pagination loop when offline
...
I'm not really sure how this is meant to work - and I'm not sure
how it was working before, but this is causing fairly bad infinite
loops if I start element with no homeserver connection. This is
a fairly crude fix, only thing I can think that would be better is
some awareness of when network requests were failing and intentionally
backing off.
Fixes https://github.com/vector-im/element-web/issues/18242
2021-07-26 22:05:35 +01:00
2114e854f9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091
...
Conflicts:
src/components/structures/SpaceRoomView.tsx
2021-07-26 12:36:00 +01:00
40947a2a68
Simplifie toast handling
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-26 12:21:58 +02:00
f63b6fc0a9
Support for getting reject info
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 10:28:27 +02:00
05fa90e7e6
Merge branch 'matrix-org:develop' into fix/call-search-areas
2021-07-24 19:16:10 +03:00
153eb05561
lint
2021-07-24 19:00:47 +03:00
e9efc95712
lint
2021-07-24 16:10:51 +03:00
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
22339688cb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/12
...
Conflicts:
src/components/structures/InteractiveAuth.js
2021-07-23 23:43:48 +01:00
70d8378a66
delint
2021-07-23 18:50:25 +01:00
1ba601ba22
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
...
Conflicts:
src/components/structures/SpaceRoomView.tsx
src/components/views/dialogs/BetaFeedbackDialog.tsx
2021-07-23 18:28:21 +01:00
5e0a397631
Refactor anonymity derivation
2021-07-23 17:58:31 +01:00
dec2c48155
remove unused import and revert removing some needed css
2021-07-23 15:56:00 +01:00
1d1a396c1f
get rid of spurious hr
2021-07-23 15:51:59 +01:00
9c7fa71a4a
Remove spaces beta feedback prompts except a couple more strategic ones
2021-07-23 15:07:24 +01:00
5ccd02dd6e
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/eslint1
...
Conflicts:
src/components/views/dialogs/CreateRoomDialog.tsx
src/components/views/messages/MImageBody.tsx
2021-07-23 10:42:46 +01:00
f5630acea7
Adhere to better eslint rules
2021-07-23 10:35:10 +01:00
358a4e5d3f
Merge pull request #6212 from matrix-org/t3chguy/fix/17686
2021-07-23 09:09:17 +01:00
8a28611a9a
Merge branch 'develop' into fix/call-search-areas
2021-07-23 10:50:33 +03:00
010baabfe6
Improve subspaces and some utilities around room/space creation
2021-07-23 08:46:20 +01:00
02b08888b5
Use modern layout in file and notification panel
2021-07-22 16:00:41 +02:00
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
2df4f7b859
Merge remote-tracking branch 'upstream/develop' into feature/collapse-pinned-mels/17938
2021-07-22 07:51:58 +02:00
e7c5711bb7
membershipTypes -> groupedEvents
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 07:45:48 +02:00
c384575375
Merge pull request #6261 from robintown/watch-show-timestamps
...
Add alwaysShowTimestamps and others to RoomView setting watchers
2021-07-21 19:44:04 -06:00
c34afdb4bd
Refactor platform properties loading
2021-07-21 18:35:25 +01:00
f358deb6c4
Manually track page views
2021-07-21 16:52:57 +01:00
26ca41f699
Cache room member count on the messagePanel
2021-07-21 17:26:41 +02:00
34f8c60b34
Hook analytics into the SDK
2021-07-21 16:15:18 +01:00
43d62aa8c1
Use more performant getMembersCount to decide to hide or show sender
2021-07-21 16:43:57 +02:00
e5bc5a933e
Use cached value to read member count
2021-07-21 16:10:18 +02:00
ae51653348
Add null guard for room prop in EventTile
2021-07-21 12:41:02 +02:00
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
dd6379cf4b
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:15:04 +02:00
d3934ff7da
Merge branch 'develop' into t3chguy/eslint
2021-07-20 11:08:13 +01:00
848b83015d
not sure how these happened :/
2021-07-20 09:37:54 +01:00
e6869797d7
remove unused prop
2021-07-20 09:27:32 +01:00
06c9a060b4
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-20 10:16:21 +02:00
ce78cdf4ad
Conform to new react and typescript eslint rules
2021-07-19 22:43:11 +01:00
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
c0123f5dad
Merge branch 'develop' into watch-show-timestamps
2021-07-18 11:47:44 -04:00
5c5b79a972
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 08:13:51 +02:00
092fdf5e5e
Be consistent about MessagePanel setting lookups
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-16 18:46:29 -04:00
158e6fa61c
Merge branch 'develop' into text-for-event-perf
2021-07-16 18:24:22 -04:00
16ed5c6645
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 21:43:33 +02:00
9d45a3760f
Fix types of the various query params dicts, arrays can be included e.g via
2021-07-16 13:11:43 +01:00
b55f69a74c
Merge pull request #6374 from matrix-org/copy-room
...
Add "Copy Link" to room context menu
2021-07-16 11:14:00 +01:00
9cb3c71afe
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into copy-room
2021-07-16 09:34:30 +01:00
685b59235d
Make error message consistent with menu title
2021-07-16 09:24:46 +01:00
651f19fb9b
Merge remote-tracking branch 'upstream/develop' into feature/hidden-rrs
2021-07-16 10:21:30 +02:00
1437188282
Also move effects handling from `event` to `Room.timeline` to wake up less
2021-07-15 18:02:02 +01:00
b0053f36d3
Fix instances of event.sender being read for just the userId - this field may not be set in time
2021-07-15 17:43:24 +01:00
ea20e041b1
Merge pull request #6382 from matrix-org/t3chguy/console
2021-07-15 13:50:13 +01:00
7c3c04d340
Fix instances of setState calls after unmount
2021-07-15 12:10:54 +01:00
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
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
ebfe38dc4a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/composer-list-autocomplete
...
Conflicts:
src/components/views/rooms/BasicMessageComposer.tsx
src/editor/autocomplete.ts
2021-07-15 09:59:40 +01:00
f4788a6427
Add dialpad to transfer dialog + various dialpad UI improvements ( #6363 )
...
Co-authored-by: Germain <germain@souquet.com>
Co-authored-by: Andrew Morgan <andrew@amorgan.xyz>
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
2021-07-15 09:55:58 +01:00
90d380c8ae
Cache value of feature_spaces* flags as they cause page refresh so are immutable
2021-07-15 08:26:49 +01:00
c7c29f2119
Merge pull request #6365 from psrpinto/fix/naming
2021-07-15 08:07:03 +01:00
dde58d449d
Only hide sender when in bubble mode
2021-07-14 17:16:13 +02:00
2fe5ad5d4b
Slightly refine error message
2021-07-14 15:07:22 +01:00
8bf5e61acc
Add "Copy" to room context menu.
...
This menu item creates a matrix.to link for the room and copies it to the clipboard.
2021-07-14 14:58:18 +01:00
226224b039
Allow sending hidden RRs
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 15:12:35 +02:00
8e64b73bd6
Merge branch 'develop' into text-for-event-perf
2021-07-13 23:25:16 -04:00
6884b2aa6d
Standardise spelling of identity server
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-13 16:28:43 +01:00
ba3e7e24ba
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-13 10:15:27 +02:00
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
8f345dc1ba
Rework backdrop to draw one image with two different level of blur
2021-07-12 13:51:46 +02:00
36ba65b534
Merge branch 'develop' into gsouquet/fix-backdrop-filter
2021-07-12 13:00:34 +02:00
33dca81352
Update some more
2021-07-12 09:10:27 +01:00
a645cebb49
Fix setTimeout/setInterval typing
2021-07-12 09:02:46 +01:00
b147bcd207
Merge branch 'develop' into text-for-event-perf
2021-07-11 11:35:12 -04:00
f80f4620df
Add pinned messages to MELS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-11 10:35:20 +02:00
9b7697c530
fix imports
2021-07-10 16:02:43 +01:00
bd175c6f40
Improve and consolidate typing
2021-07-10 15:43:46 +01:00
4b9d4ad1e3
Centralise display alias getters
2021-07-09 17:06:54 +01:00
2998018876
Merge pull request #6322 from SimonBrandner/feature/remember-server/17739
...
Remember the last used server for room directory searches
2021-07-09 12:36:54 +01:00
046b3f325c
Iterate PR
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 12:31:44 +02:00
6dcf860181
Refresh the room list only if validation failed
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 10:44:20 +02:00
84b00b5c38
Make the code more readable
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 10:39:02 +02:00
f78ede9324
Merge remote-tracking branch 'upstream/develop' into feature/remember-server/17739
2021-07-09 10:33:24 +02:00
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
7a1381135a
Simplifie some code
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 18:31:47 +02:00
27db0da437
Simpler code
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 17:40:41 +02:00
68d194444a
FocusComposer -> FocusSendMessageComposer
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 17:36:31 +02:00
7734f8aeef
Handle focusing multiple composers
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 17:33:49 +02:00
9c67679b35
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
2021-07-08 13:30:57 +02:00
72acd5a611
Merge pull request #6330 from matrix-org/dbkr/tsify_secretstorage
...
Update import location for types
2021-07-08 09:18:31 +01:00
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
14303a4ca8
Delint
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 17:20:31 +02:00
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
55896223aa
unbubble some type of events
2021-07-07 15:13:58 +02:00
5b5ef5e04c
Handle servers from settings
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 13:59:02 +02:00
255ab49ccb
Handle edge cases
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 13:48:48 +02:00
10bdb3cefa
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-07 13:07:43 +02:00
b94dc2d0e5
Remember the last used server for room directory searches
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 12:14:51 +02:00
1220ad37ce
Remove the usage of symbol
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 12:14:44 +02:00
b88d67bb00
Convert SearchResult, InteractiveAuth, PushProcessor and Scheduler to Typescript
2021-07-07 11:08:53 +01:00
7d946ee0db
Restore action bar
2021-07-07 12:04:28 +02:00
fbac730c62
Merge branch 'develop' into gsouquet/fix-backdrop-filter
2021-07-06 15:09:55 +02:00
a5cec34bad
Merge branch 'develop' into t3chguy/fix/17686
2021-07-06 14:53:40 +02:00
7d6342fa40
Merge pull request #6315 from matrix-org/gsouquet/ts-1
2021-07-06 12:04:18 +01:00
edae9a4844
Merge branch 'develop' into gsouquet/fix-backdrop-filter
2021-07-06 10:19:25 +02:00
1b25ab930e
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/dialogs/AddExistingToSpaceDialog.tsx
2021-07-05 13:06:22 +01:00
e7743e2a57
Migrate RoomScrollStateStore to TypeScript
2021-07-03 12:21:00 +01:00
f4ec197513
Migrate ForgotPassword to TypeScript
2021-07-03 11:55:10 +01:00
298a338676
Migrate CompleteSecurity to TypeScript
2021-07-03 11:38:51 +01:00
dbd102541e
Migrate E2eSetup to TypeScript
2021-07-03 11:37:06 +01:00
68011056cc
Eleventh and final batch of burning
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 12:24:07 +02:00
5d054519dc
Tenth batch of burning
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 11:57:05 +02:00
d99874318c
Ninth batch of burning
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 11:51:23 +02:00
916589e2b9
Eighth batch of burning
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 11:24:33 +02:00
6702e68778
Revert some changes due to them breaking tests (and hope it will work now)
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 09:36:18 +02:00
799d10b77e
Merge remote-tracking branch 'upstream/develop' into burn-sdk-get-comp-with-fire
2021-07-02 17:34:56 +02:00
9d569c378e
Second batch of burning
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 17:08:27 +02:00
89949bd884
Add new in the spaces beta toast & explanatory modal
2021-07-02 16:07:17 +01:00
9383ecc46f
Delint
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 13:20:02 +02:00
85399e8edf
Match code style
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 13:16:45 +02:00
b014763cd2
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 13:14:14 +02:00
82119a08f7
Merge branch 'develop' into t3chguy/ts/11
2021-07-02 11:03:54 +01:00
0425b02982
Merge pull request #6295 from matrix-org/t3chguy/ts/10
2021-07-02 09:51:58 +01:00
fb149c4ea2
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
2021-07-02 09:06:19 +01:00
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
88f691776f
Use sleep from js-sdk as no point duplicating it
2021-07-01 22:55:27 +01:00
c0fab6647d
Use defer from js-sdk as it has a better ts definition
2021-07-01 22:50:06 +01:00
53b89bbcd9
Merge pull request #6302 from matrix-org/dbkr/tsify_roomheader
...
Convert RoomHeader to TS
2021-07-01 21:33:11 +01:00
c80ba16ae9
Merge pull request #6296 from matrix-org/t3chguy/fix/17853
...
Prevent RoomDirectory from exploding when filterString is wrongly nulled
2021-07-01 21:07:35 +01:00
c51e62a62b
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/10
2021-07-01 21:01:06 +01:00
1f337b28ac
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash
...
Conflicts:
src/ContentMessages.tsx
src/components/structures/UploadBar.tsx
src/components/views/messages/MImageBody.js
src/components/views/messages/MStickerBody.js
src/components/views/messages/MVideoBody.tsx
2021-07-01 20:48:34 +01:00
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
9ea4ca39c6
Be more like other arrow functions
2021-07-01 18:54:51 +01:00
ae16efcf5b
Remove rateLimitedFunc
2021-07-01 18:35:38 +01:00
c6d1dc7e8e
lint
2021-07-01 15:11:18 +01:00
16fb24fa09
Remove unused prop
2021-07-01 14:03:01 +01:00
642405dbd0
Use new types
2021-07-01 13:55:57 +01:00
70a3679d43
more ts
2021-07-01 13:49:58 +01:00
46b2f0404a
Basic ts-ification of SetupEncryptionBody
2021-07-01 13:45:33 +01:00
4c42313f99
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
src/createRoom.ts
2021-07-01 12:47:34 +01:00
5c6466d824
use better types
2021-07-01 10:01:48 +01:00
d354a0a23b
Prevent RoomDirectory from exploding when filterString is wrongly nullified
2021-07-01 09:57:33 +01:00
fcdb0a27d0
Convert EventTimeline, EventTimelineSet and TimelineWindow to TS
2021-07-01 09:53:54 +01:00
fdced3da1b
Remove reminescent references to the tinter
2021-06-30 08:09:55 +01:00
2021650d77
Merge branch 'develop' into watch-show-timestamps
2021-06-29 22:43:46 -04:00
adb5df52a4
Merge branch 'develop' into text-for-event-perf
2021-06-29 22:13:18 -04:00
a59e94b907
delint
2021-06-29 22:21:05 +01:00
8f4879ea96
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8
...
Conflicts:
src/components/structures/MessagePanel.tsx
src/components/structures/ScrollPanel.tsx
src/components/structures/TimelinePanel.tsx
src/components/views/elements/ErrorBoundary.tsx
src/components/views/elements/EventListSummary.tsx
src/components/views/messages/TileErrorBoundary.tsx
2021-06-29 22:14:40 +01:00
782e793925
Merge remote-tracking branch 'origin/develop' into jryans/rework-linting-2
2021-06-29 15:27:24 +01:00
21b8c81eb8
Merge remote-tracking branch 'origin/develop' into jryans/rework-linting-2
2021-06-29 15:25:30 +01:00
623317cd47
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8
...
Conflicts:
src/components/structures/MessagePanel.tsx
src/components/structures/TimelinePanel.tsx
2021-06-29 15:22:54 +01:00
640fc591bb
Merge pull request #6279 from matrix-org/gsouquet/deprecate-tinter
...
Deprecate Tinter and TintableSVG
2021-06-29 15:22:48 +01:00
0551becafd
Fix long lines
2021-06-29 13:42:51 +01:00
bbdd93f592
Auto-fix more errors
2021-06-29 13:26:09 +01:00
b501665971
Fix parsing errors
2021-06-29 13:23:13 +01:00
ae0a8b8da4
Auto-fix lint errors
2021-06-29 13:11:58 +01:00
88cd5aeaf6
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/elements/StyledRadioGroup.tsx
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
2021-06-29 12:29:45 +01:00
db015519ed
Code style changes for FilePanel
2021-06-29 12:19:27 +01:00
56e05041fd
Import curly spaces
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-06-29 12:13:41 +01:00
652f57371a
Migrate FilePanel to TypeScript
2021-06-29 11:38:19 +01:00
14ef38e057
Merge pull request #6280 from robintown/group-acls
...
Group ACLs with MELS
2021-06-29 10:02:12 +01:00
298bf30b18
Fix editState not getting passed through
2021-06-29 08:16:43 +01:00
a11193e243
Group ACLs with MELS
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-28 12:36:40 -04:00
6607294573
Deprecate Tinter and TintableSVG
2021-06-28 17:13:23 +01:00
e43df0e3c6
delint
2021-06-28 16:11:38 +01:00
c708afe216
Pull scroll_to_bottom up a level similarly to prevent it firing on NotifPanel/FilePanel when sending a message
2021-06-28 16:03:52 +01:00
fd9e891647
Clean up by pulling listeners up to parent RoomView
2021-06-28 16:02:34 +01:00
83af38a85f
Fix multiple timeline panels handling composer and edit events
2021-06-28 15:56:37 +01:00
6d6995e6fb
Merge pull request #6265 from matrix-org/t3chguy/fix/17770
2021-06-25 15:43:33 +01:00
5932b93325
make backdrop closer to what is happening in production
2021-06-25 14:09:49 +01:00
a17b13f83a
Add drawable copyright header
2021-06-25 11:47:33 +01:00
bf89aa909e
Add BackdropPanel copyright header
2021-06-25 11:46:38 +01:00
a8e2c1bc2a
Move the dial pad button next to Explore button from Create Room context menu ( #6237 )
...
This commit moves the dial pad from a context menu to sit right by the explore button, in line with the designs in the linked issue. The dial pad button is only shown when PSTN support is detected.
2021-06-25 11:45:15 +01:00
1c8e24023e
Fix space preview for when user cannot join the space
2021-06-25 11:00:27 +01:00
6d293d1092
Merge branch 'develop' into gsouquet/fix-backdrop-filter
2021-06-25 09:43:54 +01:00
e628cac06b
Improve image drawing fill strategy
2021-06-25 09:38:29 +01:00
652ad3617d
Backdrop filter compatibility for Firefox and Safari
2021-06-25 09:20:03 +01:00
a921d32f44
Fix lint
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-24 18:51:46 -04:00
f9fe28a6ad
Merge branch 't3chguy/ts/8' into text-for-event-perf
2021-06-24 18:45:08 -04:00
70bf47ced4
Merge branch 't3chguy/ts/8' into watch-show-timestamps
2021-06-24 12:53:37 -04:00
27ee7c5836
Move backdrop filter to a canvas based solution
2021-06-24 17:51:11 +01:00
3d6c6cea89
Fix AutoHideScrollbar typing
2021-06-24 16:43:12 +01:00
c5a1da49ce
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8
...
Conflicts:
src/components/structures/AutoHideScrollbar.tsx
2021-06-24 16:42:03 +01:00
d466d1a7ee
Add alwaysShowTimestamps and others to RoomView setting watchers
...
to allow them to update on the fly. This also modifies the setting
watchers to avoid an unnecessary settings lookup.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-24 11:28:16 -04:00
0e2f617d94
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15051
2021-06-24 09:33:39 +01:00
9bceb40820
CallMediaHandler -> MediaDeviceHandler
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 09:26:33 +02:00
759a4e796f
Merge pull request #6234 from SimonBrandner/fix/room-dir-click/13751
...
Improve room directory click behaviour
2021-06-22 19:44:20 -06:00
bbdc28f56d
Merge pull request #6241 from matrix-org/t3chguy/ts/7
2021-06-22 22:34:15 +01:00
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
cecf0ce299
Convert MessagePanel, TimelinePanel, ScrollPanel, and more to Typescript
2021-06-22 20:41:26 +01:00
6fd1dc7d18
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/7
2021-06-22 18:09:24 +01:00
59258585b3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/5
2021-06-22 17:28:19 +01:00
a839d0f396
More typescript conversion
2021-06-22 17:23:13 +01:00
3d3c428455
Fix DesktopBuildsNotice return type
2021-06-22 10:26:49 +01:00
066ef18db2
Replace onClick by onMouseDown
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-22 09:24:42 +02:00
a59deeb491
Add onClick handlers
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-22 09:16:45 +02:00
de40657194
Don't show room if we don't click on buttons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-22 09:12:41 +02:00
845bb95887
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/5
2021-06-21 20:46:28 +01:00
7f635c68c5
Migrate SearchBar to TypeScript
2021-06-21 14:50:21 +01:00
e79b7d7adb
Fix View Source accessing renamed private field on MatrixEvent
2021-06-21 09:45:22 +01:00
401fe1d05b
Add call silencing to CallEvent
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-19 20:03:09 +02:00
a2a5158411
Fix View Source accessing renamed private field on MatrixEvent
2021-06-19 15:37:48 +01:00
3b7c92fd9e
Use new js-sdk types properly
2021-06-18 16:18:42 +01:00
f96c366aa4
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-18 17:07:43 +02:00
9cce5ef10f
Consolidate types with js-sdk changes
2021-06-18 15:31:12 +01:00
d08f8087c6
Merge branch 'matrix-org:develop' into text-for-event-perf
2021-06-18 10:29:41 -04:00
538165d515
Fix phase enum usage in JS modules as well
...
https://github.com/matrix-org/matrix-react-sdk/pull/6185 converted
`SetupEncryptionStore` to TS, including moving the phase states to an enum. The
calling JS modules were forgotten, so they got a bit confused.
Fixes https://github.com/vector-im/element-web/issues/17689
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/6185
2021-06-18 14:05:12 +01:00
d22617c422
More specific type definition and adhering to code style better
2021-06-18 12:44:15 +01:00
3f1ca970d6
Merge branch 'develop' into gsouquet/dialogs-ts-migration
2021-06-18 12:27:00 +01:00
dddc32d870
Merge pull request #6208 from matrix-org/t3chguy/ts/5
2021-06-18 09:49:03 +01:00
f38cd38bd3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740
...
Conflicts:
src/components/structures/TimelinePanel.js
src/components/views/context_menus/MessageContextMenu.js
src/components/views/right_panel/UserInfo.tsx
src/dispatcher/actions.ts
2021-06-17 15:31:06 +01:00
949532c297
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
2021-06-17 15:53:25 +02:00
e4250e254c
Propertly thread showHiddenEventsInTimeline through groupers
2021-06-17 09:52:15 -04:00
3e38d92fa4
Fix up some more type defs
2021-06-17 14:49:27 +01:00
af11878e0c
Use cached setting values when calling TextForEvent
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-16 20:41:36 -04:00
ccf30ed94c
Merge pull request #6202 from matrix-org/t3chguy/fix/17669
2021-06-16 12:46:44 +01:00
ab964339d2
Add another setState skip to prevent redundant state updates
2021-06-16 12:11:17 +01:00
d87325ae6a
Small cleanup around the room status bar and auxpanel to prevent redundant state updates
2021-06-16 12:06:41 +01:00
e3a6ce13cd
Fix tight-loop update issue caused by a broken shouldComponentUpdate
2021-06-16 12:04:37 +01:00
deb2e8d679
Remove unused methods
2021-06-16 12:04:01 +01:00
47ddd33d21
Remove explicit `.js` imports
2021-06-16 10:24:51 +01:00
Šimon Brandner