34363 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jaiwanth	efccf19e9e	Update src/utils/exportUtils/exportUtils.ts ... Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>	2021-06-29 10:14:00 +05:30
Jaiwanth	e6cb0666ef	Update src/utils/exportUtils/exportUtils.ts ... Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>	2021-06-29 10:13:51 +05:30
Jaiwanth	4ddbe76fbd	Update src/components/views/dialogs/ExportDialog.tsx ... Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>	2021-06-29 10:13:38 +05:30
Jaiwanth	f0d0b77b8c	Update src/TextForEvent.tsx ... Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>	2021-06-29 10:13:14 +05:30
Jaiwanth	fc81001316	Hide alt text if the image isn't present (for unavailable avatars)	2021-06-28 13:23:50 +05:30
Jaiwanth	00ee3efbff	Wrap avatar fetch in try catch	2021-06-28 12:41:32 +05:30
Jaiwanth	64b683a0df	Add cancel warning and progress completion modals	2021-06-28 12:20:41 +05:30
Jaiwanth	efd8bf3a0f	Delint	2021-06-28 11:00:34 +05:30
Jaiwanth	d8f763664b	Add warning modal during export	2021-06-27 22:18:43 +05:30
Jaiwanth	d46fe678b0	Handle export cancellation	2021-06-27 20:55:54 +05:30
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
Jaiwanth	685441baf5	Remove avatarForExport string	2021-06-26 23:40:35 +05:30
J. Ryan Stinnett	18b470820d	Merge pull request #6270 from SimonBrandner/fix/presence/17786 ... Fix hyper-precise presence	2021-06-26 18:47:17 +01:00
Jaiwanth	55ffb318e5	Change format order	2021-06-26 23:08:37 +05:30
Jaiwanth	46f34ba455	Add validation	2021-06-26 23:07:38 +05:30
Jaiwanth	e505646f21	Finish dialog implementation of export settings	2021-06-26 21:54:10 +05:30
Jaiwanth	92e34c7993	Format dropdown	2021-06-26 13:04:10 +05:30
Jaiwanth	c3dc51c452	Create export dialog and async import export utils	2021-06-26 12:14:18 +05:30
Šimon Brandner	3c6612df93	Fix hyper-precise presence ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-26 07:53:42 +02:00
Jaiwanth	4d6ad91e52	Add export option to right panel	2021-06-25 22:45:14 +05:30
Michael Telatynski	6d6995e6fb	Merge pull request #6265 from matrix-org/t3chguy/fix/17770	2021-06-25 15:43:33 +01:00
Michael Telatynski	1f27049a5d	Merge pull request #6257 from SimonBrandner/feature/pinned-click	2021-06-25 14:42:18 +01:00
Michael Telatynski	b371abe556	Merge pull request #6266 from matrix-org/t3chguy/fix/17768 ... Fix space avatar management layout being broken	2021-06-25 11:58:41 +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
Jaiwanth	566e7bc8d6	format	2021-06-25 15:52:01 +05:30
Michael Telatynski	620e14eb4b	Fix space avatar management layout being broken	2021-06-25 11:10:37 +01:00
Jaiwanth	4af8ec4d40	Explicitly declare file extensions for stickers and log event fetching progress	2021-06-25 15:40:28 +05:30
Michael Telatynski	a8649ca091	i18n	2021-06-25 11:02:33 +01:00
Michael Telatynski	1c8e24023e	Fix space preview for when user cannot join the space	2021-06-25 11:00:27 +01:00
Michael Telatynski	5facee56b0	Fix space settings using join rule private instead of invite	2021-06-25 10:41:45 +01:00
Michael Telatynski	2b9e2e2e85	Fix private space creation setting an alias anyway	2021-06-25 10:41:13 +01:00
Jaiwanth	593f14beae	Append media text to text for event	2021-06-25 15:01:14 +05:30
Jaiwanth	c885cd719f	i18n	2021-06-25 14:58:59 +05:30
Jaiwanth	abbe047bfd	try catch for plain text	2021-06-25 14:49:01 +05:30
Jaiwanth	02f15d573a	Refactor	2021-06-25 11:52:26 +05:30
Jaiwanth	3718826e94	refactor to share downloading code across all formats	2021-06-25 11:16:59 +05:30
Jaiwanth	91b8b2ac5a	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations	2021-06-24 22:54:40 +05:30
Jaiwanth	ccd02c48b3	Nicer indentation	2021-06-24 22:49:36 +05:30
Michael Telatynski	8f6d31b73c	Merge pull request #6251 from SimonBrandner/ts/entity-and-member-tile	2021-06-24 17:05:16 +01:00
Michael Telatynski	767b8cd5c7	Merge pull request #6260 from matrix-org/t3chguy/2 ... Fix UserInfo not working when rendered without a room	2021-06-24 16:37:35 +01:00
Michael Telatynski	d83a92959b	Fix UserInfo not working when rendered without a room	2021-06-24 16:30:40 +01:00
Šimon Brandner	ff11244de8	Trailing spaces ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-24 17:27:53 +02:00
Šimon Brandner	e282c4aa54	Simplifie code ... Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>	2021-06-24 17:23:42 +02:00
Šimon Brandner	430ae0e79f	Merge remote-tracking branch 'upstream/develop' into feature/pinned-click	2021-06-24 16:59:18 +02:00
Šimon Brandner	cc1f68296e	Iterate ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-24 16:58:56 +02:00
Šimon Brandner	dc2f71bee6	Even more fixes ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-24 16:55:44 +02:00
Travis Ralston	006c6df205	Merge pull request #6253 from matrix-org/travis/leave-reasons ... Update membership reason handling, including leave reason displaying	2021-06-24 08:52:34 -06:00
Šimon Brandner	b065f6d1a4	Remove sdk... ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-24 16:48:36 +02:00
Šimon Brandner	f0dbc974fa	Merge remote-tracking branch 'upstream/develop' into ts/entity-and-member-tile	2021-06-24 16:44:13 +02:00
Šimon Brandner	c0a1127cb7	Fix PowerStatus ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-24 16:43:11 +02:00