Commit Graph

14487 Commits

Author SHA1 Message Date
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
Michael Telatynski
d9912651d6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17176
 Conflicts:
	src/components/structures/SpaceRoomDirectory.tsx
2021-05-06 13:06:50 +01:00
Michael Telatynski
d47eecbd24 Make button sizes more consistent and fix untrapped behaviour of join button leaking to parent 2021-05-06 13:05:58 +01:00
Germain Souquet
0c87a67caf Lazily decrypt events on room view 2021-05-06 11:46:25 +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
90538c95aa Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 2021-05-06 08:05:14 +01:00
Aaron Raimist
9aa711b7b7 Merge branch 'develop' into initialisation 2021-05-06 00:09:48 -05:00
Michael Telatynski
9518e4d415 Guard all isSpaceRoom calls behind the labs flag 2021-05-05 23:59:07 +01:00
Michael Telatynski
68210b1415 Merge pull request #5963 from matrix-org/t3chguy/fix/17119
Update space ordering behaviour to match updates in MSC
2021-05-05 22:26:45 +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
Michael Telatynski
70087b30bf Add disclaimer about subspaces being experimental in add existing dialog 2021-05-05 17:53:31 +01:00
Michael Telatynski
650933096a Iterate Spaces admin UX around room management 2021-05-05 17:25:29 +01: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
886959f32d port rate limiting code over to space creation wizard's add existing rooms 2021-05-05 11:54:14 +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
Šimon Brandner
2044ff0149 Correctly handle defaults
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-05 11:48:55 +02:00
Šimon Brandner
791f39abcc Initial support for persistent collapsed states
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-05 08:31:07 +02: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
Michael Telatynski
a70be45b6e Experiment switching the Home Space out for an All rooms space 2021-05-04 18:26:49 +01: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
Michael Telatynski
ac61c8eca8 Adhere to updated sort order for space children 2021-05-04 12:27:27 +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
Michael Telatynski
a7642b2b24 Fix space name "Empty room" during creation wizard 2021-05-04 10:48:34 +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
Šimon Brandner
9755da6f09 Add ?
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 19:59:51 +02: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
Šimon Brandner
f79339c2da Add missing semicolon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 18:36:11 +02:00
Šimon Brandner
889b90fbc3 Fix const values
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 18:33:24 +02: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
Šimon Brandner
941a6e1c1b Don't duplicate code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 18:16:36 +02:00
Šimon Brandner
0bf2b01f84 Keep PiP in the window when resizing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 18:11:02 +02:00
Šimon Brandner
be2da6376e Simplifie translation code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 17:49:55 +02:00
Šimon Brandner
d8d380c74d Always keep the PiP CallView on the screen
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 17:22:45 +02:00
Šimon Brandner
f93ff1c8ae Add semicolons to event listeners
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 15:43:13 +02:00
Šimon Brandner
2c9231641b Add ref to callViewWrapper
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 15:40:59 +02:00
Šimon Brandner
76f503666c Add default offset
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 15:40:12 +02:00
Šimon Brandner
0851cf4415 Simplifie things
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 15:16:08 +02:00
Šimon Brandner
adcdd72a08 preventDefault() and stopPropagation() only if moving
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 15:07:25 +02:00