190ccb6f00
Merge and add export support for the modified MAudioBody
2021-07-02 10:41:04 +05:30
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
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
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
d354a0a23b
Prevent RoomDirectory from exploding when filterString is wrongly nullified
2021-07-01 09:57:33 +01:00
fdced3da1b
Remove reminescent references to the tinter
2021-06-30 08:09:55 +01:00
551639811b
Merge and resolve conflicts
2021-06-30 12:29:13 +05:30
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
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
637e3afa48
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-29 11:31:30 +05:30
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
398d49245f
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations
2021-06-26 23:42:42 +05:30
6d6995e6fb
Merge pull request #6265 from matrix-org/t3chguy/fix/17770
2021-06-25 15:43:33 +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
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
544761329c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-24 18:33:30 +05:30
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
b2162c3be9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-23 12:09:46 +05:30
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
Jaiwanth