Šimon Brandner
834579f778
Don't render any audio non-primary feeds
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-11 13:07:30 +02:00
Šimon Brandner
1b877f2b7c
Make SpaceTreeLevelLayoutStore into a singleton
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-11 11:16:14 +02:00
Šimon Brandner
4115fd8695
Rewrite SpaceTreeLevelLayoutStore to save paths
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-11 11:13:13 +02:00
Michael Telatynski
5eed9f6cba
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17227
2021-05-11 09:14:01 +01:00
Šimon Brandner
965af1a642
Initial SpaceTreeLevelLayoutStore implementation
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-11 08:08:02 +02:00
Jaiwanth
87d95d0cb1
Merge branch 'save-edited-state-messages' of github.com:jaiwanth-v/matrix-react-sdk into save-edited-state-messages
2021-05-11 11:12:32 +05:30
Šimon Brandner
bc0ff5bbea
Merge branch 'develop' into fix/17164/remember-collapsed-state
2021-05-11 07:38:08 +02:00
Jaiwanth
4ea3fbc5ba
Add comments and newlines back and resolve merge conflicts
2021-05-11 11:07:34 +05:30
Jaiwanth
376befd38e
Update src/components/views/rooms/EditMessageComposer.js
...
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-05-11 10:37:53 +05:30
Travis Ralston
12657f0fbc
Merge branch 'develop' into edit-slashcommands
2021-05-10 20:09:33 -06:00
Travis Ralston
122565b3ac
Update src/components/views/rooms/EditMessageComposer.js
2021-05-10 20:03:20 -06:00
Robin Townsend
c39d9649ba
Merge branch 'develop' into improved-forwarding-ui
2021-05-10 13:38:02 -04:00
Robin Townsend
503301aa89
Make rooms in ForwardDialog clickable
...
…so that you can jump to a room easily once you've forwarded a message
there.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 13:00:06 -04:00
Michael Telatynski
70d7a59ea2
Merge pull request #5969 from matrix-org/t3chguy/fix/17044.1
...
Switch the Home Space out for an All rooms space
2021-05-10 16:26:05 +01:00
Michael Telatynski
95b43d1284
Merge pull request #5985 from aaronraimist/blank-device-name
...
Show device ID in UserInfo when there is no device name
2021-05-10 16:19:56 +01:00
Michael Telatynski
3a75eb1226
Fix handling of enter/return in space creation menu
2021-05-10 14:39:10 +01:00
Šimon Brandner
acd0fa4c0e
Add a comment about when it is possible to screenshare
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-10 14:42:06 +02:00
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
Šimon Brandner
90f4ad7a83
Always sort feeds
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-10 13:21:02 +02:00
Šimon Brandner
135cdb2255
Add dialog with info about the screensharing change
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-10 12:37:40 +02:00
Šimon Brandner
2749715050
Remove screensharing call type
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-10 12:26:28 +02: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
09ba74a851
Disable forward buttons for rooms without send permissions
...
…and add a tooltip to explain why they can't accept forwarded messages.
It was chosen to disable the buttons rather than hide the entries from
the list, since hiding them without explanation could cause confusion.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 01:10:41 -04:00
Robin Townsend
100efb1a90
Fix ForwardDialog crashing when rendering reply
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 00:40:54 -04:00
Robin Townsend
c96888c9cb
Make ForwardDialog more readable
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 00:38:01 -04:00
Robin Townsend
219c983d19
Use import instead of sdk.getComponent
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-09 10:58:44 -04:00
Jaiwanth
1f77048750
Minor refactor
2021-05-09 16:12:04 +05:30
Jaiwanth
6f98aa06c4
Save edited state when switching rooms
...
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-05-09 13:42:01 +05:30
Robin Townsend
e46bc93178
Fall back to MXID when no display name is present
...
MemberAvatar requires a display name, or else it refuses to render.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-08 21:22:31 -04:00
Robin Townsend
44b143c8c3
Match requested avatar size to displayed size
...
Reduces the blurriness of avatars in the EventTilePreview.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-08 21:17:05 -04:00
Robin Townsend
7fa81766db
Remove old forwarding code
...
This has been replaced by ForwardDialog.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-08 21:11:06 -04:00
Robin Townsend
b9b237fc9a
Replace forwarding UI with dialog
...
Replaces the old forwarding UI with a dialog based on designs from
https://github.com/vector-im/element-web/issues/14690 .
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-08 21:11:06 -04:00
Šimon Brandner
69b0425c10
Improve and fix sorting
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-08 18:50:13 +02:00
Šimon Brandner
430808ae2e
Simplifie CSS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-08 16:49:47 +02:00
Šimon Brandner
4c9d9dd214
Enable screenshare in all video calls
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-08 10:04:26 +02:00
Aaron Raimist
fa307ee14c
Update src/components/views/right_panel/UserInfo.tsx
...
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-05-07 18:41:47 -05:00
Šimon Brandner
5b2f941ce2
Add button to screenshare
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-07 21:35:32 +02:00
Šimon Brandner
1f27354439
Add support for up to 4 feeds
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-07 21:34:56 +02: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
Ayush PS
39402ec971
Lint errors
2021-05-07 19:14:29 +05:30
Ayush PS
c843387043
Merge branch 'develop' into Bubble-bericht
2021-05-07 18:32:38 +05:30
Michael Telatynski
cb13200c2d
last minute copy tweak
2021-05-07 11:56:41 +01:00
Michael Telatynski
a8c4aabb52
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
...
Conflicts:
src/components/structures/SpaceRoomView.tsx
src/i18n/strings/en_EN.json
2021-05-07 11:50:49 +01:00
Michael Telatynski
6137162786
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17044.1
...
Conflicts:
src/stores/room-list/RoomListStore.ts
2021-05-07 10:40:07 +01:00
Michael Telatynski
4079b03ae0
Bring back filter all spaces behaviour
2021-05-07 10:39:35 +01: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
Ayush PS
f367d617c5
Added the extra classes
2021-05-07 14:37:28 +05:30
Aaron Raimist
1f2895dbe9
Merge branch 'develop' into blank-device-name
2021-05-06 20:19:49 -05:00
Aaron Raimist
5d7535738a
Show device ID in UserInfo when there is no device name
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-05-06 20:01:53 -05:00
Tulir Asokan
cc919452b5
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2021-05-07 00:07:51 +03:00