Commit Graph
5876 Commits
Author SHA1 Message Date
Jaiwanth 398d49245f Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations 2021-06-26 23:42:42 +05:30
Michael TelatynskiandGitHub 6d6995e6fb Merge pull request #6265 from matrix-org/t3chguy/fix/17770 2021-06-25 15:43:33 +01:00
Germain Souquet 5932b93325 make backdrop closer to what is happening in production 2021-06-25 14:09:49 +01:00
Germain Souquet a17b13f83a Add drawable copyright header 2021-06-25 11:47:33 +01:00
Germain Souquet bf89aa909e Add BackdropPanel copyright header 2021-06-25 11:46:38 +01:00
Andrew MorganandGitHub 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
Germain Souquet 6d293d1092 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-06-25 09:43:54 +01:00
Germain Souquet e628cac06b Improve image drawing fill strategy 2021-06-25 09:38:29 +01:00
Germain Souquet 652ad3617d Backdrop filter compatibility for Firefox and Safari 2021-06-25 09:20:03 +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
Germain Souquet 27ee7c5836 Move backdrop filter to a canvas based solution 2021-06-24 17:51:11 +01: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
Jaiwanth 544761329c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-24 18:33:30 +05:30
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
Jaiwanth b2162c3be9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-23 12:09:46 +05:30
Travis RalstonandGitHub 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 TelatynskiandGitHub 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
Jaiwanth 45be4a6d02 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-22 09:27:37 +05:30
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 TelatynskiandJ. Ryan Stinnett 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 TownsendandGitHub 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 TelatynskiandGitHub 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 TownsendandGitHub 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