6cbbc0ecb4
Replace hard coded forExport string by mxc url
2021-06-29 11:29:05 +05:30
e404fa3cae
Apply suggestions
2021-06-29 10:57:02 +05:30
025a7eb9a5
Iterate PR
2021-06-29 10:36:24 +05:30
b506de0989
Update src/components/views/messages/MFileBody.js
...
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com >
2021-06-29 10:19:11 +05:30
60c6af501b
Update src/components/views/dialogs/ExportDialog.tsx
...
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com >
2021-06-29 10:18:17 +05:30
7a09bcb5a2
Update src/components/views/dialogs/ExportDialog.tsx
...
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com >
2021-06-29 10:17:38 +05:30
e459f3841d
Update src/components/views/dialogs/ExportDialog.tsx
...
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com >
2021-06-29 10:17:14 +05:30
a92ddb3f27
Update src/components/views/dialogs/ExportDialog.tsx
...
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com >
2021-06-29 10:16:32 +05:30
7bbfaed500
Update src/components/views/dialogs/ExportDialog.tsx
...
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com >
2021-06-29 10:16:08 +05:30
b626a3d5cb
Update src/components/views/dialogs/ExportDialog.tsx
...
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com >
2021-06-29 10:15:46 +05:30
7a5aea1441
Update src/components/views/dialogs/ExportDialog.tsx
...
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com >
2021-06-29 10:15:20 +05:30
1014e9ea48
Update src/components/views/dialogs/ExportDialog.tsx
...
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com >
2021-06-29 10:14:56 +05:30
7b683a1f64
Update src/components/views/dialogs/ExportDialog.tsx
...
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com >
2021-06-29 10:14:24 +05:30
4ddbe76fbd
Update src/components/views/dialogs/ExportDialog.tsx
...
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com >
2021-06-29 10:13:38 +05:30
64b683a0df
Add cancel warning and progress completion modals
2021-06-28 12:20:41 +05:30
d8f763664b
Add warning modal during export
2021-06-27 22:18:43 +05:30
d46fe678b0
Handle export cancellation
2021-06-27 20:55:54 +05:30
398d49245f
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations
2021-06-26 23:42:42 +05:30
685441baf5
Remove avatarForExport string
2021-06-26 23:40:35 +05:30
18b470820d
Merge pull request #6270 from SimonBrandner/fix/presence/17786
...
Fix hyper-precise presence
2021-06-26 18:47:17 +01:00
46f34ba455
Add validation
2021-06-26 23:07:38 +05:30
e505646f21
Finish dialog implementation of export settings
2021-06-26 21:54:10 +05:30
92e34c7993
Format dropdown
2021-06-26 13:04:10 +05:30
c3dc51c452
Create export dialog and async import export utils
2021-06-26 12:14:18 +05:30
3c6612df93
Fix hyper-precise presence
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-26 07:53:42 +02:00
4d6ad91e52
Add export option to right panel
2021-06-25 22:45:14 +05:30
6d6995e6fb
Merge pull request #6265 from matrix-org/t3chguy/fix/17770
2021-06-25 15:43:33 +01:00
1f27049a5d
Merge pull request #6257 from SimonBrandner/feature/pinned-click
2021-06-25 14:42:18 +01:00
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
1c8e24023e
Fix space preview for when user cannot join the space
2021-06-25 11:00:27 +01:00
5facee56b0
Fix space settings using join rule private instead of invite
2021-06-25 10:41:45 +01:00
2b9e2e2e85
Fix private space creation setting an alias anyway
2021-06-25 10:41:13 +01:00
3718826e94
refactor to share downloading code across all formats
2021-06-25 11:16:59 +05:30
91b8b2ac5a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-24 22:54:40 +05:30
8f6d31b73c
Merge pull request #6251 from SimonBrandner/ts/entity-and-member-tile
2021-06-24 17:05:16 +01:00
d83a92959b
Fix UserInfo not working when rendered without a room
2021-06-24 16:30:40 +01:00
430ae0e79f
Merge remote-tracking branch 'upstream/develop' into feature/pinned-click
2021-06-24 16:59:18 +02:00
dc2f71bee6
Even more fixes
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-24 16:55:44 +02:00
b065f6d1a4
Remove sdk...
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-24 16:48:36 +02:00
f0dbc974fa
Merge remote-tracking branch 'upstream/develop' into ts/entity-and-member-tile
2021-06-24 16:44:13 +02:00
c0a1127cb7
Fix PowerStatus
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-24 16:43:11 +02:00
f08b92309f
Iterate EntityTile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-24 16:35:33 +02:00
bc786cdf4a
Merge pull request #6220 from matrix-org/t3chguy/ts/5.1
2021-06-24 15:23:59 +01:00
544761329c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-24 18:33:30 +05:30
112dfa2b96
Finish JSON export implementation
2021-06-24 18:19:12 +05:30
8fb788ae56
Iterate EntityTile once more
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-24 14:39:51 +02:00
5b21cff240
Iterate MemberTile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-24 14:38:21 +02:00
1b64cd0c88
Iterate PresenceLabel
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-24 14:36:22 +02:00
298e505381
Iterate EntityTile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-24 14:29:24 +02:00
f965d449b8
Merge pull request #6249 from SimonBrandner/ts/member-list
2021-06-24 13:25:59 +01:00
Jaiwanth