Commit Graph

36172 Commits (b333612deab879160da92f8b4409d88ae6d4b398)

Author SHA1 Message Date
Jaiwanth 7a5aea1441
Update src/components/views/dialogs/ExportDialog.tsx
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-06-29 10:15:20 +05:30
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 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
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
Michael Telatynski 690656e3b2
Merge pull request #6281 from maunium/unread-notices
Let m.notice messages mark a room as unread
2021-06-28 19:14:15 +01:00
Tulir Asokan bf55672263 Remove unused import
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2021-06-28 21:08:19 +03:00
Tulir Asokan 188bd548c6 Let m.notice messages mark a room as unread
The typescript conversion of Unread.js in matrix-org/matrix-react-sdk#6241
fixed a 6-year-old typo and stopped messages with msgtype=m.notice from being
counted as unread messages. This makes it very difficult to use rooms dedicated
for bot notices (like RSS or GitHub webhook bots).

Signed-off-by: Tulir Asokan <tulir@maunium.net>
2021-06-28 20:51:14 +03: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 494f4d3ab4
Merge pull request #6248 from matrix-org/t3chguy/fix/17731 2021-06-28 16:08:12 +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
Michael Telatynski 208c62048f Fix right panel store cleaning some state when permalink within room is clicked 2021-06-28 15:48:13 +01:00
Michael Telatynski 500be0d0d8
Merge pull request #6276 from matrix-org/t3chguy/fix/17805
Fix tiny scrollbar dot on chrome/electron in Forward Dialog
2021-06-28 15:47:34 +01:00
Michael Telatynski 56514d51a6 Fix tiny scrollbar dot on chrome/electron in Forward Dialog 2021-06-28 15:37:28 +01:00
Germain 53a6089cc9
Merge pull request #6268 from matrix-org/gsouquet/upgrade-puppeteer 2021-06-28 10:28:56 +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 96857ab7f7 Fix end-to-end tests rejectToast 2021-06-28 09:01:04 +01:00
Jaiwanth fc81001316 Hide alt text if the image isn't present (for unavailable avatars) 2021-06-28 13:23:50 +05:30
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
Travis Ralston c16228b8ca
Update src/voice/VoiceRecording.ts
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-06-28 01:22:05 -06:00
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
Šimon Brandner 43732e5c12
Inherit font-family
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-26 20:53:14 +02:00
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