38145 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael Telatynski	6d0af83df4	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969 ... Conflicts: src/components/views/dialogs/LeaveSpaceDialog.tsx src/i18n/strings/en_EN.json	2021-09-27 11:19:49 +01:00
Germain	e5f2a06102	Merge pull request #6861 from SimonBrandner/task/messages-ts	2021-09-27 10:03:11 +01:00
Šimon Brandner	0cba943f96	Fix types ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-09-27 10:35:33 +02:00
Šimon Brandner	6a88ac900c	Merge remote-tracking branch 'upstream/develop' into task/messages-ts	2021-09-27 10:32:25 +02:00
Šimon Brandner	2712dde581	Remove empty line ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-09-27 10:28:07 +02:00
Germain	4fa4ff23c3	Merge pull request #6863 from SimonBrandner/task/utils-ts	2021-09-27 09:26:04 +01:00
Germain	3e34f72378	Merge pull request #6864 from SimonBrandner/task/rageshake-ts	2021-09-27 09:25:05 +01:00
Šimon Brandner	dd92f8f1f9	Move imports ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-09-27 10:21:46 +02:00
Šimon Brandner	1ed4a9eb4f	Fix JSDoc type ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-09-27 10:19:53 +02:00
Šimon Brandner	a1d5e7ba66	Add return type ... Co-authored-by: Germain <germain@souquet.com>	2021-09-27 10:12:55 +02:00
Šimon Brandner	6aa5d98741	Remove constructor ... Co-authored-by: Germain <germain@souquet.com>	2021-09-27 10:12:45 +02:00
Šimon Brandner	b6fc10b65e	Merge remote-tracking branch 'upstream/develop' into task/rageshake-ts ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-09-27 09:56:09 +02:00
Germain	a4e5397d8a	Merge pull request #6866 from SimonBrandner/task/stores-ts	2021-09-27 08:34:40 +01:00
Šimon Brandner	af9429c8a0	Convert ActiveWidgetStore to TS ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-09-26 19:57:02 +02:00
Šimon Brandner	2584b5bc6b	Convert rageshake to TS ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-09-26 16:53:43 +02:00
Šimon Brandner	ee344efb3d	Convert MegolmExportEncryption to TS ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-09-26 15:20:42 +02:00
Šimon Brandner	aa10cf45a5	Convert KeyVerificationStateObserver to TS ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-09-26 15:05:51 +02:00
Šimon Brandner	0c6bf950f6	Convert HostingLink to TS ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-09-26 15:03:50 +02:00
Šimon Brandner	755bfb4562	Convert DirectoryUtils to TS ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-09-26 15:02:07 +02:00
Šimon Brandner	fb5c18caa0	Convert MKeyVerificationConclusion to TS ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-09-26 14:51:46 +02:00
Šimon Brandner	c287d15fa0	Convert RoomCreate to TS ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-09-26 13:42:29 +02:00
Šimon Brandner	421fa1ab69	Convert RoomAvatarEvent to TS ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-09-26 13:42:28 +02:00
Šimon Brandner	ff1c1fbc78	Convert MjolnirBody to TS ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-09-26 13:08:05 +02:00
Šimon Brandner	bee85a0bcd	Convert EditHistoryMessage to TS ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-09-26 13:08:04 +02:00
Travis Ralston	0354a7025d	Merge pull request #6862 from SimonBrandner/task/usercontent-ts ... Convert `/src/usercontent` to TS	2021-09-25 20:52:37 -06:00
Šimon Brandner	3450e91e32	Improve typing ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-09-25 09:58:01 +02:00
Šimon Brandner	1a2476609c	Fix code to be equivalent to the previous one ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-09-25 07:55:40 +02:00
Šimon Brandner	27f74b3ebd	Remove unnecessary type ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-09-25 07:53:38 +02:00
Šimon Brandner	bffebb9304	Convert index to TS ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-09-24 20:51:50 +02:00
Germain	79b52f8a22	Merge pull request #6857 from matrix-org/gsouquet/composer-reply-18989	2021-09-24 15:05:40 +01:00
David Baker	d33bc4c0e2	Merge pull request #6860 from matrix-org/dbkr/fix_user_view ... Fix the User View	2021-09-24 14:44:07 +01:00
David Baker	9f26cca256	Fix the User View ... Extreme confusion between users and members, and presumably we were passing one as the other and they were similar enough that it worked. UserView still makes fake member objects but this at least fixes the user view in the right panel. Fixes https://github.com/vector-im/element-web/issues/19158	2021-09-24 14:35:00 +01:00
Germain	a2917a4a30	Merge pull request #6859 from matrix-org/gsouquet/threads-timestamp-fix	2021-09-24 13:27:50 +01:00
Germain Souquet	bb7319f632	move timestamp to the right in thread's context	2021-09-24 11:44:11 +01:00
Germain Souquet	836e427dc8	Scope editor reset when reply changed for thread view	2021-09-24 11:13:57 +01:00
Germain	6be12ea47e	Merge pull request #6858 from matrix-org/gsouquet/switch-room-threads-18987	2021-09-24 11:11:33 +01:00
Germain Souquet	82d685e410	Only switch to ThreadPanel when roomId changes	2021-09-24 11:06:07 +01:00
Germain Souquet	070f279ae7	Close thread view when changing room	2021-09-23 14:44:03 +01:00
Germain Souquet	bd599c96a3	Add React lifecycle methods publicity and return types	2021-09-23 14:43:39 +01:00
Germain Souquet	a9f7ab785c	Change CIDER state persistence key to cater for threads ... Extending the CIDER state persistence to threads and make sure that SendMessageComposer can restore drafts for specific threads This also prevents the thread's replyToEvent to leaking in the room composer	2021-09-23 10:59:33 +01:00
Germain	2cd5b731bf	Merge pull request #6851 from matrix-org/gsouquet/timeline-rendering-18719	2021-09-22 17:23:07 +01:00
Travis Ralston	7cd7cf87e3	Merge pull request #6853 from videogame-hacker/patch/undefined-3pids ... Fix Notifications settings view when threepids is undefined	2021-09-22 10:22:58 -06:00
David Baker	f69854b274	Merge pull request #6856 from SimonBrandner/fix/soft-crash ... Fix `AppsDrawer` soft crash	2021-09-22 14:56:00 +01:00
Šimon Brandner	96c16354ca	Fix soft crash ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-09-22 15:47:15 +02:00
David Baker	40dedfa44a	Merge pull request #6852 from matrix-org/gsouquet/fix-18999 ... Fix spacing for message composer buttons	2021-09-22 13:39:28 +01:00
videogame hacker	d323bc4c07	Fix Notifications settings view when threepids is undefined ... Signed-off-by: Charlotte Som <half-kh-hacker@hackery.site>	2021-09-22 13:17:49 +01:00
Germain Souquet	dc979a33a1	Fix spacing for message composer buttons	2021-09-22 11:55:25 +01:00
Germain Souquet	1265fe6b86	Set comprehensive set of props for thread's MessagePanel	2021-09-22 10:48:24 +01:00
Germain	b13fdb698c	Merge pull request #6743 from SimonBrandner/task/dialogs-ts	2021-09-22 10:43:19 +01:00
Šimon Brandner	4adc900d00	Remove autoFocus ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-09-22 10:46:59 +02:00