Jaiwanth
1014e9ea48
Update src/components/views/dialogs/ExportDialog.tsx
...
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-06-29 10:14:56 +05:30
Jaiwanth
7b683a1f64
Update src/components/views/dialogs/ExportDialog.tsx
...
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-06-29 10:14:24 +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
Aaron Raimist
734dbae248
Merge branch 'develop' into string-pl
2021-06-28 22:49:13 -05:00
Aaron Raimist
434b313850
Merge branch 'develop' into string-pl
2021-06-28 22:13:51 -05:00
Travis Ralston
7a4ceec985
Restore clamped dimensions on voice recorder waveform
2021-06-28 21:02:42 -06:00
Travis Ralston
d6cf2346fe
Manually conflict resolve https://github.com/matrix-org/matrix-react-sdk/pull/6240
2021-06-28 21:00:36 -06:00
Travis Ralston
964a97d59e
Merge remote-tracking branch 'origin/develop' into travis/new-audio
2021-06-28 20:52:44 -06:00
Travis Ralston
b6d9ecde8b
Merge pull request #6240 from matrix-org/gsouquet/voice-messages-waveform-perf
...
Improve audio recording performance
2021-06-28 20:49:21 -06:00
Travis Ralston
e519e704e9
Apply suggestions from code review
2021-06-28 20:40:11 -06:00
Michael Telatynski
86228e08d8
Merge pull request #6278 from matrix-org/t3chguy/fix/17738
2021-06-28 23:24:31 +01:00
Robin Townsend
a11193e243
Group ACLs with MELS
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-28 12:36:40 -04:00
Michael Weimann
d3bc7fe806
remove list keys
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-28 18:29:32 +02:00
Michael Weimann
e685f1239d
use null vars for context menu lists
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-28 18:29:32 +02:00
Germain Souquet
6607294573
Deprecate Tinter and TintableSVG
2021-06-28 17:13:23 +01:00
J. Ryan Stinnett
a8f5b7ebae
Merge pull request #5953 from DantrazTrev/Bubble-bericht
...
Removes the override on the Bubble Container
2021-06-28 16:23:40 +01:00
Michael Telatynski
e43df0e3c6
delint
2021-06-28 16:11:38 +01:00
J. Ryan Stinnett
52b578fb3f
Merge pull request #6193 from SimonBrandner/fix/irc-layout-mxid/17648
...
Fix IRC layout regressions
2021-06-28 16:10:02 +01:00
Michael Telatynski
c708afe216
Pull scroll_to_bottom up a level similarly to prevent it firing on NotifPanel/FilePanel when sending a message
2021-06-28 16:03:52 +01:00
Michael Telatynski
fd9e891647
Clean up by pulling listeners up to parent RoomView
2021-06-28 16:02:34 +01:00
Michael Telatynski
83af38a85f
Fix multiple timeline panels handling composer and edit events
2021-06-28 15:56:37 +01: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
Germain
a576362c74
Merge pull request #6275 from matrix-org/gsouquet/toast-button-kind
2021-06-28 09:10:09 +01:00
Germain Souquet
d669f55b60
Make toast dismiss button less prominent
2021-06-28 08:52:15 +01:00
Travis Ralston
1874f3b963
Merge pull request #6269 from matrix-org/travis/encrypt-voice
...
Encrypt the voice message file if needed
2021-06-28 01:30:16 -06:00
Jaiwanth
64b683a0df
Add cancel warning and progress completion modals
2021-06-28 12:20:41 +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
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
Travis Ralston
b5bb767b8f
Appease the linter
2021-06-25 14:11:50 -06:00
Travis Ralston
cb0d2a2c4f
Encrypt the voice message file if needed
...
Fixes https://github.com/vector-im/element-web/issues/17729
"oops, should have done that"
2021-06-25 13:54:05 -06:00
Michael Telatynski
4e6260e617
delint
2021-06-25 20:01:03 +01: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
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
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
Travis Ralston
76caba0385
Restore mx_VoiceMessagePrimaryContainer class
2021-06-25 00:10:32 -06:00
Jaiwanth
3718826e94
refactor to share downloading code across all formats
2021-06-25 11:16:59 +05:30
Travis Ralston
d724af600f
Remove copy/paste fails
2021-06-24 20:41:00 -06:00