Commit graph

1014 commits

Author SHA1 Message Date
Šimon Brandner
a90b8f32f1
Add some tests
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 16:45:04 +02:00
Šimon Brandner
d9b8f0d540
Add docs
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 15:58:35 +02:00
Michael Telatynski
437d53d1cc Update space children (best effort) when upgrading a room 2021-07-09 08:43:41 +01:00
Šimon Brandner
91d208d514
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 08:26:19 +02:00
Germain Souquet
edae9a4844 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-07-06 10:19:25 +02:00
Michael Telatynski
1b25ab930e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
 Conflicts:
	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
2021-07-05 13:06:22 +01:00
Michael Telatynski
89949bd884 Add new in the spaces beta toast & explanatory modal 2021-07-02 16:07:17 +01:00
Michael Telatynski
e8f0412fe3 Add way to manage Restricted join rule in Room Settings 2021-07-02 14:51:55 +01:00
Jaiwanth
87c624d085 Use ref for progress updates 2021-07-02 16:52:33 +05:30
Michael Telatynski
82119a08f7
Merge branch 'develop' into t3chguy/ts/11 2021-07-02 11:03:54 +01:00
Jaiwanth
3dcc7738f6 Add missing semicolon 2021-07-02 10:53:19 +05:30
Jaiwanth
f2e67604e7 Delint 2021-07-02 10:49:24 +05:30
Jaiwanth
190ccb6f00 Merge and add export support for the modified MAudioBody 2021-07-02 10:41:04 +05:30
Jaiwanth
6ca664636e Display progress 2021-07-02 10:23:34 +05:30
David Baker
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
Michael Telatynski
88f691776f Use sleep from js-sdk as no point duplicating it 2021-07-01 22:55:27 +01:00
Michael Telatynski
c0fab6647d Use defer from js-sdk as it has a better ts definition 2021-07-01 22:50:06 +01:00
Michael Telatynski
e768ecb3d0 Typescript conversion of Composer components and more 2021-06-30 13:01:26 +01:00
Jaiwanth
08d886e9d1 Delint 2021-06-30 14:08:22 +05:30
Jaiwanth
551639811b Merge and resolve conflicts 2021-06-30 12:29:13 +05:30
Jaiwanth
b0be7d2861 Add license and negate the conditional 2021-06-29 19:43:21 +05:30
J. Ryan Stinnett
ae0a8b8da4 Auto-fix lint errors 2021-06-29 13:11:58 +01:00
Jaiwanth
497d8102e2 Handle mxc urls for non-encrypted rooms 2021-06-29 12:54:44 +05:30
Jaiwanth
3fc4be0be9 Add return types to ABC Exporter 2021-06-29 11:40:26 +05:30
Jaiwanth
637e3afa48 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-29 11:31:30 +05:30
Jaiwanth
6cbbc0ecb4 Replace hard coded forExport string by mxc url 2021-06-29 11:29:05 +05:30
Jaiwanth
e404fa3cae Apply suggestions 2021-06-29 10:57:02 +05:30
Jaiwanth
de6bc3f2ed
Update src/utils/exportUtils/Exporter.ts
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-06-29 10:19:57 +05:30
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
Travis Ralston
e519e704e9
Apply suggestions from code review 2021-06-28 20:40:11 -06:00
Germain Souquet
6cb86057c5 Merge branch 'develop' into gsouquet/voice-messages-waveform-perf 2021-06-28 09:29:11 +01:00
Germain Souquet
652e06a7b1 remove cancelAnimationFrame complexity and rely on MarkedExecution class 2021-06-28 09:24:35 +01:00
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
efd8bf3a0f Delint 2021-06-28 11:00:34 +05:30
Jaiwanth
d46fe678b0 Handle export cancellation 2021-06-27 20:55:54 +05:30
Jaiwanth
685441baf5 Remove avatarForExport string 2021-06-26 23:40:35 +05:30
Jaiwanth
55ffb318e5 Change format order 2021-06-26 23:08:37 +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
Germain Souquet
533d5ad664 Specify return type for drawable promise 2021-06-25 11:49:24 +01:00
Germain Souquet
a17b13f83a Add drawable copyright header 2021-06-25 11:47:33 +01:00
Jaiwanth
566e7bc8d6 format 2021-06-25 15:52:01 +05:30
Jaiwanth
4af8ec4d40 Explicitly declare file extensions for stickers and log event fetching progress 2021-06-25 15:40:28 +05:30
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
Germain Souquet
6d293d1092 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-06-25 09:43:54 +01:00
Germain Souquet
652ad3617d Backdrop filter compatibility for Firefox and Safari 2021-06-25 09:20:03 +01:00