Commit Graph

9840 Commits

Author SHA1 Message Date
J. Ryan Stinnett 4311d91372 Merge pull request #5982 from SimonBrandner/fix/17184/dont-use-event-meta
Don't use the event's metadata to calc the scale of an image
2021-05-10 13:06:08 +01:00
J. Ryan Stinnett 45acf70b00 Merge pull request #5981 from matrix-org/jryans/upload-preview-mimetype
Adjust MIME type of upload confirmation if needed
2021-05-10 10:21:35 +01:00
Robin Townsend 119c14c3f9 Forbid redaction of encryption events
Redacting m.room.encryption events will leave the room in a broken
state, and so we shouldn't allow the user to do this.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-07 12:49:37 -04:00
Michael Telatynski 6f28964b49 Merge pull request #5979 from matrix-org/t3chguy/spaces-logs
Guard all isSpaceRoom calls behind the labs flag
2021-05-07 10:28:14 +01:00
Šimon Brandner 7ad270928a Simplifie code a bit
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-06 16:41:09 +02:00
Šimon Brandner bb9803a94e Don't try to use the event's metadata to calc the scale
That has lead to https://github.com/vector-im/element-web/issues/17184

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-06 16:40:33 +02:00
J. Ryan Stinnett 06a9577858 Merge remote-tracking branch 'origin/develop' into jryans/upload-preview-mimetype 2021-05-06 14:45:48 +01:00
J. Ryan Stinnett dc50d27985 Adjust MIME type of upload confirmation if needed
This filters the MIME type of uploaded files to ensure we display safely.
2021-05-06 14:39:44 +01:00
J. Ryan Stinnett 437f13cf76 Convert UploadConfirmDialog to TSX 2021-05-06 14:11:34 +01:00
J. Ryan Stinnett 683aec1066 Merge pull request #5833 from SimonBrandner/feed
Support for multiple streams (not MSC3077)
2021-05-06 11:20:09 +01:00
Michael Telatynski 9518e4d415 Guard all isSpaceRoom calls behind the labs flag 2021-05-05 23:59:07 +01:00
Travis Ralston 3e1265b9bb Merge pull request #5970 from matrix-org/travis/voicemessages/colors
Update colours and sizing for voice messages
2021-05-05 11:09:18 -06:00
J. Ryan Stinnett 62774d7c16 Merge pull request #5962 from jaiwanth-v/cleanup-imageview
Add cleanup functions for image view
2021-05-05 17:02:43 +01:00
Michael Telatynski 7cae566011 Merge pull request #5975 from matrix-org/t3chguy/fix/16891
Add retry mechanism and progress bar to add existing to space dialog
2021-05-05 16:32:31 +01:00
J. Ryan Stinnett 4bc5990071 Merge pull request #5755 from aaronraimist/warn-on-access-token-reveal
Warn on access token reveal
2021-05-05 16:32:12 +01:00
Michael Telatynski 07f5b6e8c4 Add retry mechanism and progress bar to add existing to space dialog 2021-05-05 11:45:12 +01:00
Travis Ralston a94c1a90c1 Update colours and sizing for voice messages
Fixes https://github.com/vector-im/element-web/issues/17162
2021-05-04 20:45:15 -06:00
Travis Ralston 54931cb43e Merge remote-tracking branch 'origin/develop' into travis/voicemessages/timeline 2021-05-04 09:05:04 -06:00
Travis Ralston 704edfc05b Merge pull request #5959 from matrix-org/travis/voicemessages/permissions
Handle no/blocked microphones in voice messages
2021-05-04 09:03:38 -06:00
Michael Telatynski caa772348f Actually fix the layout bug without re-regressing the prior issue 2021-05-04 14:14:06 +01:00
Michael Telatynski 4489f8a6ea Fix hover behaviour of space invites 2021-05-04 14:01:26 +01:00
Jaiwanth 3eea1b8369 Add cleanup functions for image view 2021-05-04 16:42:22 +05:30
J. Ryan Stinnett 96592aa75e Merge pull request #5948 from jaiwanth-v/room-preview-spaces
Generate room preview even when minimized
2021-05-04 11:58:53 +01:00
Jaiwanth 29aec4abdb Use middlePanelResized instead of noisy 2021-05-04 15:39:46 +05:30
Michael Telatynski e9f59ed093 Merge pull request #5943 from matrix-org/t3chguy/fix/17082
Sort rooms in the add existing to space dialog based on recency
2021-05-04 10:57:23 +01:00
Travis Ralston 87a57ec7e5 Handle no/blocked microphones in voice messages
Fixes https://github.com/vector-im/element-web/issues/17139
2021-05-03 16:41:39 -06:00
Jaiwanth 54e139a6ad Generate previews when the room tile is maximised 2021-05-03 23:17:10 +05:30
Travis Ralston 8abd251ec5 delib 2021-05-03 11:43:46 -06:00
Travis Ralston 3f4ee9742a Simple rendering of voice messages in the timeline
Fixes https://github.com/vector-im/element-web/issues/17138
2021-05-03 11:41:14 -06:00
Travis Ralston d7ed2d3486 Switch to m.audio with extensible events 2021-05-03 10:27:15 -06:00
Jaiwanth cf9edb1884 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into room-preview-spaces 2021-05-03 21:53:54 +05:30
Aaron Raimist 35c1e54521 lint
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-04-30 21:55:00 -05:00
Aaron Raimist 626a4ccc34 Make warning bold, close copied tooltip on escape
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-04-30 21:45:37 -05:00
Michael Telatynski 0008ef7ab1 Merge pull request #5942 from matrix-org/t3chguy/fix/16998
Make the text filter search all spaces instead of just the selected one
2021-04-30 12:53:38 +01:00
J. Ryan Stinnett 83035b6b6a Merge pull request #5931 from SimonBrandner/fix-indent
Enable indent rule and fix indent
2021-04-30 11:51:22 +01:00
Šimon Brandner 5913203dc6 Merge branch 'develop' into fix-indent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-29 20:08:14 +02:00
Šimon Brandner 232b87a3b4 Improve formatting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-29 19:57:02 +02:00
Jaiwanth 70204d6111 Prevent peeking members from reacting
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-04-29 22:41:57 +05:30
Jaiwanth d2de115b2f Generate room preview even when minimized
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-04-29 21:37:44 +05:30
Michael Telatynski 62198601d2 Tweak room list filter placeholder and results copy for spaces 2021-04-29 16:40:08 +01:00
Michael Telatynski bed52319bc Sort rooms in the add existing to space dialog based on recency 2021-04-28 23:39:24 +01:00
Michael Telatynski 9f8955fb6c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/16628
 Conflicts:
	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
2021-04-28 22:49:36 +01:00
Travis Ralston 3890bec8ad Merge pull request #5860 from samhh/always-render-ignored-users
Render ignored users setting regardless of if there are any
2021-04-28 09:51:57 -06:00
Travis Ralston 14f1388522 Merge pull request #5830 from SimonBrandner/fix-trailing-colon
Fix inserting trailing colon after mention/pill
2021-04-28 09:51:50 -06:00
Travis Ralston 8d8525cdeb Merge pull request #5935 from matrix-org/travis/voice/control-bar
Voice messages: Composer controls
2021-04-28 09:38:28 -06:00
Travis Ralston d4acd0e41c Remove excess IState 2021-04-28 09:28:46 -06:00
Šimon Brandner 653591e806 Use CallChangeRoom in CallViewForRoom
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-28 11:56:26 +02:00
Šimon Brandner 40748d3c94 Make CallHandler emit CallChangeRoom
Let's hope I changed the tests correctly

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-28 11:49:07 +02:00
Šimon Brandner e5b61f0632 Keep rendering AudioFeeds on hold
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-28 11:29:05 +02:00
Šimon Brandner 4c58a95046 Merge branch 'develop' into feed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-28 10:59:47 +02:00