Michael Telatynski
b88d67bb00
Convert SearchResult, InteractiveAuth, PushProcessor and Scheduler to Typescript
2021-07-07 11:08:53 +01:00
Germain Souquet
7d946ee0db
Restore action bar
2021-07-07 12:04:28 +02:00
Germain Souquet
a5cec34bad
Merge branch 'develop' into t3chguy/fix/17686
2021-07-06 14:53:40 +02:00
Germain
7d6342fa40
Merge pull request #6315 from matrix-org/gsouquet/ts-1
2021-07-06 12:04:18 +01:00
Michael Telatynski
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
Germain Souquet
e7743e2a57
Migrate RoomScrollStateStore to TypeScript
2021-07-03 12:21:00 +01:00
Germain Souquet
f4ec197513
Migrate ForgotPassword to TypeScript
2021-07-03 11:55:10 +01:00
Germain Souquet
298a338676
Migrate CompleteSecurity to TypeScript
2021-07-03 11:38:51 +01:00
Germain Souquet
dbd102541e
Migrate E2eSetup to TypeScript
2021-07-03 11:37:06 +01:00
Šimon Brandner
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
Šimon Brandner
5d054519dc
Tenth batch of burning
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 11:57:05 +02:00
Šimon Brandner
d99874318c
Ninth batch of burning
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 11:51:23 +02:00
Šimon Brandner
916589e2b9
Eighth batch of burning
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 11:24:33 +02:00
Šimon Brandner
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
Šimon Brandner
799d10b77e
Merge remote-tracking branch 'upstream/develop' into burn-sdk-get-comp-with-fire
2021-07-02 17:34:56 +02:00
Šimon Brandner
9d569c378e
Second batch of burning
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 17:08:27 +02:00
Michael Telatynski
89949bd884
Add new in the spaces beta toast & explanatory modal
2021-07-02 16:07:17 +01:00
Šimon Brandner
9383ecc46f
Delint
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 13:20:02 +02:00
Šimon Brandner
85399e8edf
Match code style
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 13:16:45 +02:00
Šimon Brandner
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
Michael Telatynski
82119a08f7
Merge branch 'develop' into t3chguy/ts/11
2021-07-02 11:03:54 +01:00
Michael Telatynski
0425b02982
Merge pull request #6295 from matrix-org/t3chguy/ts/10
2021-07-02 09:51:58 +01:00
Michael Telatynski
fb149c4ea2
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
2021-07-02 09:06:19 +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
Michael Telatynski
88f691776f
Use sleep from js-sdk as no point duplicating it
2021-07-01 22:55:27 +01:00
Michael Telatynski
c0fab6647d
Use defer from js-sdk as it has a better ts definition
2021-07-01 22:50:06 +01:00
David Baker
53b89bbcd9
Merge pull request #6302 from matrix-org/dbkr/tsify_roomheader
...
Convert RoomHeader to TS
2021-07-01 21:33:11 +01:00
Michael Telatynski
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
Michael Telatynski
c51e62a62b
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/10
2021-07-01 21:01:06 +01:00
Michael Telatynski
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
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
David Baker
9ea4ca39c6
Be more like other arrow functions
2021-07-01 18:54:51 +01:00
David Baker
ae16efcf5b
Remove rateLimitedFunc
2021-07-01 18:35:38 +01:00
David Baker
c6d1dc7e8e
lint
2021-07-01 15:11:18 +01:00
David Baker
16fb24fa09
Remove unused prop
2021-07-01 14:03:01 +01:00
David Baker
642405dbd0
Use new types
2021-07-01 13:55:57 +01:00
David Baker
70a3679d43
more ts
2021-07-01 13:49:58 +01:00
David Baker
46b2f0404a
Basic ts-ification of SetupEncryptionBody
2021-07-01 13:45:33 +01:00
Michael Telatynski
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
Michael Telatynski
5c6466d824
use better types
2021-07-01 10:01:48 +01:00
Michael Telatynski
d354a0a23b
Prevent RoomDirectory from exploding when filterString is wrongly nullified
2021-07-01 09:57:33 +01:00
Michael Telatynski
fcdb0a27d0
Convert EventTimeline, EventTimelineSet and TimelineWindow to TS
2021-07-01 09:53:54 +01:00
Germain Souquet
fdced3da1b
Remove reminescent references to the tinter
2021-06-30 08:09:55 +01:00
Robin Townsend
2021650d77
Merge branch 'develop' into watch-show-timestamps
2021-06-29 22:43:46 -04:00
Robin Townsend
adb5df52a4
Merge branch 'develop' into text-for-event-perf
2021-06-29 22:13:18 -04:00
Michael Telatynski
a59e94b907
delint
2021-06-29 22:21:05 +01:00
Michael Telatynski
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
J. Ryan Stinnett
782e793925
Merge remote-tracking branch 'origin/develop' into jryans/rework-linting-2
2021-06-29 15:27:24 +01:00
J. Ryan Stinnett
21b8c81eb8
Merge remote-tracking branch 'origin/develop' into jryans/rework-linting-2
2021-06-29 15:25:30 +01:00
Michael Telatynski
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
Germain
640fc591bb
Merge pull request #6279 from matrix-org/gsouquet/deprecate-tinter
...
Deprecate Tinter and TintableSVG
2021-06-29 15:22:48 +01:00
J. Ryan Stinnett
0551becafd
Fix long lines
2021-06-29 13:42:51 +01:00
J. Ryan Stinnett
bbdd93f592
Auto-fix more errors
2021-06-29 13:26:09 +01:00
J. Ryan Stinnett
b501665971
Fix parsing errors
2021-06-29 13:23:13 +01:00
J. Ryan Stinnett
ae0a8b8da4
Auto-fix lint errors
2021-06-29 13:11:58 +01:00
Michael Telatynski
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
Germain Souquet
db015519ed
Code style changes for FilePanel
2021-06-29 12:19:27 +01:00
Germain
56e05041fd
Import curly spaces
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-06-29 12:13:41 +01:00
Germain Souquet
652f57371a
Migrate FilePanel to TypeScript
2021-06-29 11:38:19 +01:00
J. Ryan Stinnett
14ef38e057
Merge pull request #6280 from robintown/group-acls
...
Group ACLs with MELS
2021-06-29 10:02:12 +01:00
Michael Telatynski
298bf30b18
Fix editState not getting passed through
2021-06-29 08:16:43 +01:00
Robin Townsend
a11193e243
Group ACLs with MELS
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-28 12:36:40 -04:00
Germain Souquet
6607294573
Deprecate Tinter and TintableSVG
2021-06-28 17:13:23 +01:00
Michael Telatynski
e43df0e3c6
delint
2021-06-28 16:11:38 +01:00
Michael Telatynski
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
Michael Telatynski
fd9e891647
Clean up by pulling listeners up to parent RoomView
2021-06-28 16:02:34 +01:00
Michael Telatynski
83af38a85f
Fix multiple timeline panels handling composer and edit events
2021-06-28 15:56:37 +01:00
Michael Telatynski
6d6995e6fb
Merge pull request #6265 from matrix-org/t3chguy/fix/17770
2021-06-25 15:43:33 +01:00
Andrew Morgan
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
Michael Telatynski
1c8e24023e
Fix space preview for when user cannot join the space
2021-06-25 11:00:27 +01:00
Robin Townsend
a921d32f44
Fix lint
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-24 18:51:46 -04:00
Robin Townsend
f9fe28a6ad
Merge branch 't3chguy/ts/8' into text-for-event-perf
2021-06-24 18:45:08 -04:00
Robin Townsend
70bf47ced4
Merge branch 't3chguy/ts/8' into watch-show-timestamps
2021-06-24 12:53:37 -04:00
Michael Telatynski
3d6c6cea89
Fix AutoHideScrollbar typing
2021-06-24 16:43:12 +01:00
Michael Telatynski
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
Robin Townsend
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
Michael Telatynski
0e2f617d94
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15051
2021-06-24 09:33:39 +01:00
Šimon Brandner
9bceb40820
CallMediaHandler -> MediaDeviceHandler
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 09:26:33 +02:00
Travis Ralston
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
Michael Telatynski
bbdc28f56d
Merge pull request #6241 from matrix-org/t3chguy/ts/7
2021-06-22 22:34:15 +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
cecf0ce299
Convert MessagePanel, TimelinePanel, ScrollPanel, and more to Typescript
2021-06-22 20:41:26 +01:00
Michael Telatynski
6fd1dc7d18
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/7
2021-06-22 18:09:24 +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
a839d0f396
More typescript conversion
2021-06-22 17:23:13 +01:00
Germain Souquet
3d3c428455
Fix DesktopBuildsNotice return type
2021-06-22 10:26:49 +01:00
Šimon Brandner
066ef18db2
Replace onClick by onMouseDown
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-22 09:24:42 +02:00
Šimon Brandner
a59deeb491
Add onClick handlers
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-22 09:16:45 +02:00
Šimon Brandner
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
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
Germain Souquet
7f635c68c5
Migrate SearchBar to TypeScript
2021-06-21 14:50:21 +01:00
Michael Telatynski
e79b7d7adb
Fix View Source accessing renamed private field on MatrixEvent
2021-06-21 09:45:22 +01:00
Šimon Brandner
401fe1d05b
Add call silencing to CallEvent
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-19 20:03:09 +02:00
Michael Telatynski
a2a5158411
Fix View Source accessing renamed private field on MatrixEvent
2021-06-19 15:37:48 +01:00
Michael Telatynski
3b7c92fd9e
Use new js-sdk types properly
2021-06-18 16:18:42 +01:00
Šimon Brandner
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
Michael Telatynski
9cce5ef10f
Consolidate types with js-sdk changes
2021-06-18 15:31:12 +01:00
Robin Townsend
d08f8087c6
Merge branch 'matrix-org:develop' into text-for-event-perf
2021-06-18 10:29:41 -04:00
J. Ryan Stinnett
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
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
dddc32d870
Merge pull request #6208 from matrix-org/t3chguy/ts/5
2021-06-18 09:49:03 +01:00
Michael Telatynski
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
Šimon Brandner
949532c297
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
2021-06-17 15:53:25 +02:00
Robin Townsend
e4250e254c
Propertly thread showHiddenEventsInTimeline through groupers
2021-06-17 09:52:15 -04:00
Michael Telatynski
3e38d92fa4
Fix up some more type defs
2021-06-17 14:49:27 +01:00
Robin Townsend
af11878e0c
Use cached setting values when calling TextForEvent
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-16 20:41:36 -04:00
Michael Telatynski
ccf30ed94c
Merge pull request #6202 from matrix-org/t3chguy/fix/17669
2021-06-16 12:46:44 +01:00
Michael Telatynski
ab964339d2
Add another setState skip to prevent redundant state updates
2021-06-16 12:11:17 +01:00
Michael Telatynski
d87325ae6a
Small cleanup around the room status bar and auxpanel to prevent redundant state updates
2021-06-16 12:06:41 +01:00
Michael Telatynski
e3a6ce13cd
Fix tight-loop update issue caused by a broken shouldComponentUpdate
2021-06-16 12:04:37 +01:00
Michael Telatynski
deb2e8d679
Remove unused methods
2021-06-16 12:04:01 +01:00
Michael Telatynski
47ddd33d21
Remove explicit .js
imports
2021-06-16 10:24:51 +01:00
Germain Souquet
a5d608f2af
Keep composer reply when scrolling away from a highlighted event
2021-06-16 10:01:23 +01:00
Michael Telatynski
cee294f5a7
iterate PR
2021-06-16 09:23:06 +01:00
Michael Telatynski
660a849cdd
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash
...
Conflicts:
package.json
src/ContentMessages.tsx
yarn.lock
2021-06-15 12:58:29 +01:00
Germain Souquet
7310d35d7f
Merge branch 'develop' into gsouquet/benchmark-tracking
2021-06-15 11:45:11 +01:00
Germain Souquet
011a2f2bb6
Remove test data for develop pipeline
2021-06-15 10:59:57 +01:00
Germain Souquet
d5f7f524e1
Slow down registration process
2021-06-15 10:24:07 +01:00
Germain
d3101b5ce4
Merge branch 'develop' into gsouquet/dialogs-ts-migration
2021-06-15 00:02:49 +01:00
Germain Souquet
de414cd0a6
Migrate UserSettingsDialog to TypeScript
2021-06-14 23:42:36 +01:00
Michael Telatynski
430ec8cecd
Clear selected rooms after operation in manage space rooms
2021-06-14 22:18:18 +01:00
Germain Souquet
cf822d4d4c
Migrate DeactivateAccountDialog to TypeScript
2021-06-14 21:53:44 +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
Travis Ralston
2eafe132b8
Move various createRoom types to the js-sdk
2021-06-14 13:31:58 -06:00
Šimon Brandner
fdda534053
Merge branch 'develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-09 19:23:14 +02:00
Germain
91a88f25a8
Merge pull request #6168 from matrix-org/gsouquet/fix-17586
...
Revert refreshStickyHeaders optimisations
2021-06-09 16:34:11 +01:00
Germain Souquet
927de02a8e
Revert refreshStickyHeaders optimisations
2021-06-09 14:59:55 +01:00
Germain Souquet
ceed6ecbe8
Restore Page Up/Down key bindings when focusing the composer
2021-06-09 14:03:31 +01:00
Germain
8334a2ba60
Merge pull request #6143 from robintown/hide-events-perf
2021-06-09 09:13:56 +01:00
Michael Telatynski
2938bfbadf
Merge pull request #6162 from matrix-org/t3chguy/fix/17596
...
Fix upgrade to element home button in top left menu
2021-06-08 17:48:45 +01:00
Michael Telatynski
90982f9b3f
Fix upgrade to element home button in top left menu
2021-06-08 17:31:08 +01:00
Robin Townsend
b97867271b
Merge branch 'develop' into improved-forwarding-ui
2021-06-07 19:09:36 -04:00
Michael Telatynski
801b5f9c1a
Merge pull request #6155 from matrix-org/t3chguy/spacesteammatewarning
...
Add warning to private space creation flow
2021-06-07 22:21:07 +01:00
Germain Souquet
187a367111
Add prop to alwaysShowTimestamps on TimelinePanel
2021-06-07 17:11:14 +01:00
Michael Telatynski
f3aa505673
Add warning to private space creation flow
2021-06-07 14:14:31 +01:00
Michael Telatynski
bd8fd77d54
Merge pull request #6148 from robintown/fix-timestamps
2021-06-07 13:12:11 +01:00
Germain Souquet
d111f4cbb1
Merge branch 'develop' into gsouquet/fix-files-scroll-token
2021-06-07 12:25:08 +01:00
Germain Souquet
a6ddffe74c
Add scroll token to file and notif event tiles
2021-06-07 09:26:42 +01:00
Robin Townsend
1e574307d0
Cache lowBandwidth setting to speed up BaseAvatar
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-06 23:08:47 -04:00
Robin Townsend
903d4d252a
Add optimized function to determine whether event has text to display
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-06 23:06:56 -04:00
Robin Townsend
ea2120bdfd
Fix timestamps
...
7f83590846
changed timestamps to be hidden
at the DOM level, not the CSS level. We can keep that approach, we just
need to ensure they still get shown at the right times.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-06 01:55:01 -04:00
Robin Townsend
b06da16a85
Fix jumping to bottom without a highlighted event
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 13:20:27 -04:00
Robin Townsend
a06306d560
Merge branch 'develop' into improved-forwarding-ui
2021-06-05 11:04:17 -04:00
Robin Townsend
3bf8e54d7f
Use cached RoomContext settings values throughout rooms
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 01:25:43 -04:00
Robin Townsend
48d3e41351
Cache frequently used settings values in RoomContext
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 01:23:51 -04:00
Šimon Brandner
8c533c7f8b
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
2021-06-04 08:09:31 +02:00
Travis Ralston
12e013508d
Merge pull request #6132 from matrix-org/travis/ts-mtxcli
...
Adapt for js-sdk MatrixClient conversion to TS
2021-06-04 00:07:22 -06:00
Šimon Brandner
6eb33ac730
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-04 07:49:05 +02:00
Michael Telatynski
5d0d81e79a
not sure how I butchered this merge conflict resolution this much.
2021-06-03 19:37:26 +01:00
Michael Telatynski
93010d34fd
Merge branch 'develop' into t3chguy/fix/6606
2021-06-03 19:33:09 +01:00
Germain
7f83590846
Merge pull request #6079 from matrix-org/gsouquet/switch-rooms
2021-06-03 08:44:01 +01:00
Michael Telatynski
4f50727010
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606
...
Conflicts:
src/components/structures/RoomView.tsx
src/components/views/right_panel/UserInfo.tsx
2021-06-03 08:42:05 +01:00
Michael Telatynski
83d223475b
delint imports
2021-06-03 08:41:22 +01:00
Michael Telatynski
42a3ace82a
Iterate PR based on feedback
2021-06-03 08:35:12 +01:00
Michael Telatynski
3f12b7280d
Make AutoHideScrollbar pass through all unknown props
2021-06-03 08:31:06 +01:00
Michael Telatynski
079a5c10ad
Respect space ordering field in m.tag for top level spaces
2021-06-02 16:43:38 +01:00
Germain Souquet
bc50028f70
Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash
2021-06-02 13:57:33 +01:00
Michael Telatynski
da13ec16f3
Merge branch 't3chguy/fix/17529' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282
2021-06-02 12:42:55 +01:00
Michael Telatynski
35948374e9
remove unused imports
2021-06-02 11:56:49 +01:00
Germain
9d126c51e4
Merge pull request #6113 from matrix-org/gsouquet/improve-layout-rendering
2021-06-02 11:41:59 +01:00
Michael Telatynski
bc3c759feb
Add temporary mechanism for managing communities without dnd
2021-06-02 11:33:25 +01:00
Šimon Brandner
466a52e238
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
2021-06-02 10:45:35 +02:00
Šimon Brandner
b202f997e3
Refactor setState()
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-02 10:30:17 +02:00
Šimon Brandner
521b2445a8
Refactoring and fixes
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-02 10:18:32 +02:00
Travis Ralston
c9883f346c
Build pass 1
2021-06-01 22:21:04 -06:00
Robin Townsend
56714525f2
Merge branch 'develop' into improved-forwarding-ui
2021-06-01 17:28:55 -04:00
Michael Telatynski
0b7d3f007a
Remove react-beautiful-dnd
2021-06-01 17:35:31 +01:00
Šimon Brandner
3bf28e3a6b
Remove Ended from SUPPORTED_STATES
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 16:29:52 +02:00
Šimon Brandner
6b9e2042c3
Use a Set instead of an Array
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 16:28:57 +02:00
Michael Telatynski
a1ff060138
Merge pull request #6123 from matrix-org/t3chguy/fix/17517
...
Update way of checking for registration disabled
2021-06-01 15:20:21 +01:00
Michael Telatynski
4e6f1e6294
add comment
2021-06-01 15:00:59 +01:00
Šimon Brandner
9db280bbe6
Listen for CallsChanged
...
This should avoid delays and such
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 15:31:46 +02:00
Germain Souquet
591314141b
Add methods visibility for AutoHideScrollbar
2021-06-01 14:15:42 +01:00
Germain Souquet
308ac505a8
Migrate AutoHideScrollbar to TypeScript
...
Also changed the way the React.RefObject is collected
2021-06-01 14:13:46 +01:00
Šimon Brandner
70a5715b3d
Support hangup reasons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 14:46:41 +02:00
Šimon Brandner
f1e780e642
Improved missed calls
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 13:40:25 +02:00
Šimon Brandner
9b904cdee8
Remove empty line
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 13:39:05 +02:00
Michael Telatynski
72fab80bb9
Merge pull request #6125 from matrix-org/t3chguy/fix/17521
...
Switch to stable endpoint/fields for MSC2858
2021-06-01 12:07:41 +01:00
Šimon Brandner
14605e49c4
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
2021-06-01 12:11:11 +02:00
Michael Telatynski
f11a7083ae
Switch to stable endpoint/fields for MSC2858
2021-06-01 11:01:09 +01:00
Michael Telatynski
e525d046c7
remove outdated TODO
2021-06-01 10:49:19 +01:00
Michael Telatynski
b2f01b8438
Respect newlines in space topics
2021-06-01 10:48:53 +01:00
Šimon Brandner
0785997983
Handle missed calls
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 11:28:45 +02:00
Michael Telatynski
826efeaeaa
Update way of checking for registration disabled
...
Spec says 403 + M_FORBIDDEN
2021-06-01 10:22:24 +01:00
J. Ryan Stinnett
a8b6094482
Merge pull request #5674 from churchtools/default-username
...
Add url param `defaultUsername` to prefill the login username field
2021-06-01 10:12:31 +01:00
Šimon Brandner
5b3967a486
Add handling for invite
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 11:01:10 +02:00
Šimon Brandner
67a052e46a
Reorganize things and do some fixes
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 10:55:03 +02:00
Šimon Brandner
8c67b96a0f
Save all events
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 10:42:21 +02:00
Šimon Brandner
c1fcadba3b
Manage some more call states
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 10:33:44 +02:00
Šimon Brandner
f96e25d833
Simply use call states
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 10:11:48 +02:00
Šimon Brandner
6b72c13e34
Add some call states
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 10:06:03 +02:00
Šimon Brandner
30365ca1ad
Allow picking up calls from the timeline
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 10:03:17 +02:00
Germain Souquet
d894cc6f7a
Merge branch 'develop' into gsouquet/switch-rooms
2021-06-01 09:02:28 +01:00
Šimon Brandner
dac741d8b9
Another rewrite
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 09:30:37 +02:00
Šimon Brandner
d05b1798b8
Add callId
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-30 19:44:17 +02:00
Šimon Brandner
85bcf8ed52
Hook up CallEventGrouper
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-30 19:44:17 +02:00
Šimon Brandner
8dc0e2a7ab
Add CallEventGrouper as a replacement for TimeLineCallEventStore
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-30 19:44:17 +02:00
Šimon Brandner
4ae92d8adc
Hook up TimelineCallEventStore and add Avatar
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-30 19:44:17 +02:00
Germain Souquet
fd69fce1ba
guard event listener from null values
2021-05-28 17:37:29 +01:00