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
551639811b
Merge and resolve conflicts
2021-06-30 12:29:13 +05:30
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
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
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
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
Michael Telatynski