Commit graph

27262 commits

Author SHA1 Message Date
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
Jaiwanth
4d6ad91e52 Add export option to right panel 2021-06-25 22:45:14 +05:30
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
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
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
Šimon Brandner
f08b92309f
Iterate EntityTile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 16:35:33 +02:00
Michael Telatynski
bc786cdf4a
Merge pull request #6220 from matrix-org/t3chguy/ts/5.1 2021-06-24 15:23:59 +01: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
Jaiwanth
70cc2b20d5 Fix auto import 2021-06-24 18:23:08 +05:30
Jaiwanth
112dfa2b96 Finish JSON export implementation 2021-06-24 18:19:12 +05:30
Šimon Brandner
8fb788ae56
Iterate EntityTile once more
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:39:51 +02:00
Šimon Brandner
5b21cff240
Iterate MemberTile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:38:21 +02:00
Šimon Brandner
1b64cd0c88
Iterate PresenceLabel
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:36:22 +02:00
Michael Telatynski
f6bb0f4e75
Merge pull request #6258 from matrix-org/t3chguy/fix/17752 2021-06-24 13:34:45 +01:00
Šimon Brandner
298e505381
Iterate EntityTile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:29:24 +02:00
Michael Telatynski
cc1ff2ce1c Remove unused import 2021-06-24 13:28:16 +01:00
Michael Telatynski
f965d449b8
Merge pull request #6249 from SimonBrandner/ts/member-list 2021-06-24 13:25:59 +01:00
Šimon Brandner
d2d8cb3c24
Think about what you copy-paste, Simon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:15:44 +02:00
Šimon Brandner
a774aed365
Iterate PR
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:07:43 +02:00
Michael Telatynski
4993fc3e7a Fix edit history modal
defining enums in ts module declarations sadly isn't magic
2021-06-24 11:16:13 +01:00
Michael Telatynski
01aadb460d Fix cyclic imports 2021-06-24 11:12:32 +01:00
Michael Telatynski
26d8c4d2e6 Improve design of the multi inviter error dialog 2021-06-24 10:03:32 +01:00
Jaiwanth
4bfac11911 i18n 2021-06-24 14:04:37 +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
Jaiwanth
dd40f81edf Wrap media fetch in try catch 2021-06-24 14:03:12 +05:30
Travis Ralston
72099c1a08 Update punctuation 2021-06-23 19:42:47 -06:00
Michael Telatynski
0e51fcc761 Fix pinning event in a room which hasn't had events pinned in before 2021-06-23 21:12:25 +01:00
Šimon Brandner
e25940cbdd
Convert PresenceLabel to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 19:22:11 +02:00
Šimon Brandner
87d27593de
Convert MemberTile to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 19:22:11 +02:00
Šimon Brandner
d5acfc6cf4
Convert EntityTile to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 19:22:06 +02:00
Travis Ralston
9d07519214 Merge remote-tracking branch 'nordeck/nic/feat/DisableModalWidgetButtons' into develop 2021-06-23 11:21:19 -06:00
Travis Ralston
e696a1d5dc Update membership reason handling, including leave reason displaying
Incorporates ideas from https://github.com/matrix-org/matrix-react-sdk/pull/6198
2021-06-23 10:31:08 -06:00
Šimon Brandner
99c442cea7
Convert MemberList to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 16:00:06 +02:00
Michael Telatynski
a8dfc4488f Convert more of js-sdk crypto and fix underscored field accesses 2021-06-23 14:47:24 +01:00
Michael Telatynski
73b7610228 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/5.1 2021-06-23 13:05:21 +01:00