Commit Graph

16504 Commits

Author SHA1 Message Date
David Baker cf5ec7720c Merge pull request #5525 from SimonBrandner/fix-screen-sharing
Fix desktop Matrix screen sharing and add a screen/window picker
2021-02-08 13:54:51 +00:00
J. Ryan Stinnett 811ae9ba82 Merge pull request #5616 from dangwynne/develop
Close current modal when session is logged out
2021-02-08 12:56:00 +00:00
J. Ryan Stinnett 5abced7049 Merge pull request #5551 from weeman1337/fix-15347-explore-rooms-spacing
Switch room explorer list to CSS grid
2021-02-08 11:18:01 +00:00
Šimon Brandner ffc0230ab4 Use resource as a fallback
This is useful mainly for the tests they would otherwise fail as there is no room name to display while the tests are run.

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-06 19:09:34 +01:00
Šimon Brandner 58ab5c36bb Merge branch 'develop' into show-room-name 2021-02-06 15:27:04 +01:00
Šimon Brandner cc38bcf333 Display room name
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-06 15:09:21 +01:00
Michael Weimann f0f6e4678e switch room explorer list to css grid
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-02-06 14:40:16 +01:00
Michael Telatynski 1d1a3e72ca Improve SSO login start screen and 3pid invite handling somewhat 2021-02-05 17:18:13 +00:00
J. Ryan Stinnett 295cf12cf8 Merge pull request #5621 from SimonBrandner/fix-jump-on-reaction
Don't jump to bottom on reaction
2021-02-05 14:28:25 +00:00
Šimon Brandner 69e81119e9 Don't jump to bottom on reaction
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-05 15:15:20 +01:00
J. Ryan Stinnett 81bd919a18 Port avatar restore to user profile settings 2021-02-05 14:11:57 +00:00
J. Ryan Stinnett bccfdde4ac Normalise cancel behaviour for room avatar
This normalises the behaviour of the "Cancel" button for the room profile so
that it _always_ restores the existing value for all of room name, topic, and
avatar, instead of performing a mix of restore and remove.

Fixes https://github.com/vector-im/element-web/issues/16375
2021-02-05 13:58:28 +00:00
J. Ryan Stinnett bffce8689a Allow saving room topic or name only
This changes the room profile settings to support saving _only_ the room topic or
name in case you have limited access to set one but not the other.

Fixes https://github.com/vector-im/element-web/issues/16375
2021-02-05 13:34:06 +00:00
dangwynne 12f6272ab4 implement qa feedback for closing modals when logging out 2021-02-05 09:24:12 +00:00
Šimon Brandner ec73f2ec49 Change comment styling
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-05 08:30:54 +01:00
Šimon Brandner 77248725ed Added onHeightChanged call
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-05 08:29:24 +01:00
Šimon Brandner ad5c8fe7e4 Revert "Rerender MessagePanel"
This reverts commit c7e61ac71d.
2021-02-05 08:27:07 +01:00
Šimon Brandner 9bd8fef6b3 Change comment styling
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-02-05 08:22:02 +01:00
Šimon Brandner f2d236d429 Use LayoutPropType
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-05 08:17:30 +01:00
Jason Robinson f5f8050172 Add minimize button to HostSignupDialog.tsx 2021-02-04 23:09:58 +02:00
Jason Robinson fd55b99a26 Remove a comment that is not true anymore 2021-02-04 23:05:24 +02:00
J. Ryan Stinnett 15a4032be0 Merge pull request #5530 from aaronraimist/option-hide-stickers
Add option to hide the stickers button in the composer
2021-02-04 17:01:23 +00:00
Šimon Brandner 9db86a38f6 Update src/components/views/messages/TextualBody.js
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-02-04 17:58:21 +01:00
Jason Robinson b50ac0c096 Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-04 18:32:16 +02:00
J. Ryan Stinnett 4a73f3c504 Merge pull request #5598 from SimonBrandner/fix-confusing-right-panel
Fix confusing right panel button behaviour
2021-02-04 16:30:41 +00:00
Jason Robinson 987ee702d3 Ensure iframe gets maximize/minimize events 2021-02-04 18:30:12 +02:00
Šimon Brandner fdc78396fa Replaced defaultDis and removed duplicate import
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-04 16:53:25 +01:00
Travis Ralston bf3c27a37d Fix z-index of stickerpicker 2021-02-04 02:54:25 -07:00
Travis Ralston 97584af947 Fix z-index of stickerpicker 2021-02-04 02:50:54 -07:00
dangwynne 88aa2a6f70 fix whitespace change. Signed-off-by: Dan Gwynne dangwynne1@gmail.com 2021-02-04 09:33:21 +00:00
dangwynne c1823e2e5a Close current modal when session is logged out 2021-02-03 22:31:28 +00:00
Jason Robinson 6ccce7142c Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-03 22:35:22 +02:00
Michael Telatynski 842fe36c7e Fix register exploding if the server is down or we just don't have flows 2021-02-02 17:32:05 +00:00
Michael Telatynski 3e3a88116d Fix register exploding if the server is down or we just don't have flows 2021-02-02 17:28:52 +00:00
J. Ryan Stinnett 838bbdec9d Merge pull request #5608 from matrix-org/jryans/tally-ho-release
[Release] Lock widget room ID when added
2021-02-02 15:27:05 +00:00
J. Ryan Stinnett 14f9a529b8 Lock widget room ID when added
This changes the widget room ID available to widget URL templates so that it's
locked to the room the widget was added in.

Fixes https://github.com/vector-im/element-web/issues/16337
2021-02-02 15:15:26 +00:00
J. Ryan Stinnett ecc3dbbd80 Merge pull request #5607 from matrix-org/jryans/tally-ho
Lock widget room ID when added
2021-02-02 15:03:09 +00:00
J. Ryan Stinnett e4629878bc Lock widget room ID when added
This changes the widget room ID available to widget URL templates so that it's
locked to the room the widget was added in.

Fixes https://github.com/vector-im/element-web/issues/16337
2021-02-02 14:36:44 +00:00
Michael Telatynski bad71cf52f Better errors for SSO failures 2021-02-02 13:35:26 +00:00
Michael Telatynski 5d86c2f8e0 Better errors for SSO failures 2021-02-01 16:42:58 +00:00
Šimon Brandner 022781e9bc Added a comment about updating thumbnails
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-01 16:03:20 +01:00
Šimon Brandner 28ff4e6955 Move DesktopCapturerSource
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-01 15:53:53 +01:00
J. Ryan Stinnett 799753d2b2 Merge pull request #5565 from SimonBrandner/fix-13090
Scroll to bottom on message_sent
2021-02-01 13:04:38 +00:00
J. Ryan Stinnett a32495ba9e Merge pull request #5587 from dangwynne/develop
Fix new rooms being titled 'Empty Room'
2021-02-01 13:01:38 +00:00
Michael Telatynski 741b3f76ee Merge pull request #5593 from SimonBrandner/fix-collapsing-of-left-panel
Fix saving the collapsed state of the left panel
2021-02-01 12:50:37 +00:00
Michael Telatynski 077ceeb20d Fix RoomView re-mounting breaking peeking
Because as of React 16 order of unmount & re-mount is undefined
this was causing the possibility of the unmount running after
the willMount of the replacement RoomView, upsetting the state
of the singleton inside the js-sdk.
2021-02-01 12:29:11 +00:00
Michael Telatynski 72263a4a56 Merge pull request #5602 from matrix-org/t3chguy/peeking
Fix RoomView re-mounting breaking peeking
2021-02-01 12:26:42 +00:00
J. Ryan Stinnett 50452d52ff Merge pull request #5592 from matrix-org/jryans/opt-room-id
Tweak a few room ID checks
2021-02-01 10:54:29 +00:00
J. Ryan Stinnett 89b835dd20 Merge pull request #5575 from matrix-org/jryans/no-event-pills
Remove pills from event permalinks with text
2021-02-01 10:53:22 +00:00
Michael Telatynski 53334de5a9 Fix RoomView re-mounting breaking peeking
Because as of React 16 order of unmount & re-mount is undefined
this was causing the possibility of the unmount running after
the willMount of the replacement RoomView, upsetting the state
of the singleton inside the js-sdk.
2021-01-31 16:09:11 +00:00