Commit Graph

34545 Commits (3301763f12954c95156000dd59e9f83c0a197203)

Author SHA1 Message Date
J. Ryan Stinnett 14ef38e057
Merge pull request #6280 from robintown/group-acls
Group ACLs with MELS
2021-06-29 10:02:12 +01:00
Michael Telatynski 0cc7f42f08
Merge pull request #6282 from matrix-org/t3chguy/fix/17738
Fix editState not getting passed through
2021-06-29 09:14:17 +01:00
Michael Telatynski 26592da09f
Merge pull request #5671 from weeman1337/msg-context-menu 2021-06-29 08:18:07 +01:00
Michael Telatynski 298bf30b18 Fix editState not getting passed through 2021-06-29 08:16:43 +01: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
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
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
Š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
Michael Telatynski 6d6995e6fb
Merge pull request #6265 from matrix-org/t3chguy/fix/17770 2021-06-25 15:43:33 +01:00
Germain Souquet b492072e76 add required dependency in Docker image for puppeteer 2021-06-25 15:01:28 +01:00
Michael Telatynski 1d374f6cbb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17731 2021-06-25 14:50:24 +01:00
Michael Telatynski 2e940b7763
Update res/css/structures/_RoomStatusBar.scss
Co-authored-by: Germain <germain@souquet.com>
2021-06-25 14:47:17 +01:00
Germain Souquet 2672516b6a Upgrade puppeteer to use newer version of Chrome 2021-06-25 14:47:16 +01:00
Michael Telatynski 1f27049a5d
Merge pull request #6257 from SimonBrandner/feature/pinned-click 2021-06-25 14:42:18 +01:00
Priit Jõerüüt 39cb5a7058 Translated using Weblate (Estonian)
Currently translated at 99.8% (2988 of 2993 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
2021-06-25 13:35:17 +00:00
Andrei e539b91d58 Translated using Weblate (Romanian)
Currently translated at 3.6% (110 of 2993 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ro/
2021-06-25 13:35:15 +00:00
Ridhubharan 4ce5df2fb5 Translated using Weblate (Tamil)
Currently translated at 6.7% (202 of 2993 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ta/
2021-06-25 13:35:10 +00:00
Kaede 213cd39030 Translated using Weblate (Japanese)
Currently translated at 77.5% (2322 of 2993 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ja/
2021-06-25 13:35:01 +00:00