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
12f6272ab4
implement qa feedback for closing modals when logging out
2021-02-05 09:24:12 +00:00
ec73f2ec49
Change comment styling
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-05 08:30:54 +01:00
77248725ed
Added onHeightChanged call
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-05 08:29:24 +01:00
ad5c8fe7e4
Revert "Rerender MessagePanel"
...
This reverts commit c7e61ac71d
2021-02-05 08:27:07 +01:00
9bd8fef6b3
Change comment styling
...
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-02-05 08:22:02 +01:00
03fe0f1f17
s not z
2021-02-04 23:17:48 +02:00
f5f8050172
Add minimize button to HostSignupDialog.tsx
2021-02-04 23:09:58 +02:00
fd55b99a26
Remove a comment that is not true anymore
2021-02-04 23:05:24 +02:00
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
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
b50ac0c096
Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip
2021-02-04 18:32:16 +02:00
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
987ee702d3
Ensure iframe gets maximize/minimize events
2021-02-04 18:30:12 +02:00
a4318299ff
Merge pull request #5601 from weeman1337/fix-16325-timestamp-jump
...
Fix jumping timestamp if hovering a message with e2e indicator bar
2021-02-04 16:02:18 +00:00
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
a730170a5d
Merge pull request #5614 from SimonBrandner/fix-icon-position
...
Fix avatar and trash alignment
2021-02-04 15:28:11 +00:00
e9740f5a69
Merge branch 'master' into develop
2021-02-04 12:05:45 +00:00
0fe54deab1
v3.13.1
2021-02-04 12:04:27 +00:00
2cab6f66f0
Prepare changelog for v3.13.1
2021-02-04 12:04:27 +00:00
20e6501366
Merge pull request #5618 from matrix-org/travis/rel-stickerpickerfix
...
[Release] Fix z-index of stickerpicker
2021-02-04 03:00:38 -07:00
5130347621
Merge pull request #5617 from matrix-org/travis/stickerpicker-zindex
...
Fix z-index of stickerpicker
2021-02-04 03:00:31 -07:00
bf3c27a37d
Fix z-index of stickerpicker
2021-02-04 02:54:25 -07:00
97584af947
Fix z-index of stickerpicker
2021-02-04 02:50:54 -07:00
88aa2a6f70
fix whitespace change. Signed-off-by: Dan Gwynne dangwynne1@gmail.com
2021-02-04 09:33:21 +00:00
c1823e2e5a
Close current modal when session is logged out
2021-02-03 22:31:28 +00:00
6ccce7142c
Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip
2021-02-03 22:35:22 +02:00
b73227eaca
Merge branch 'develop' into fix-icon-position
2021-02-03 18:46:45 +01:00
b8ee23cdf4
Make consistent for all events
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-03 18:41:09 +01:00
7489011ab7
Merge pull request #5615 from matrix-org/jryans/pill-room-via
...
Fix permalink via parsing for rooms
2021-02-03 16:30:48 +00:00
474c029db5
Fix permalink via parsing for rooms
...
This adjusts the app local link parsing path to better handle `via`s in query
params. Previously this path only expected them when an event ID was also
present, but it's also valid to have `via`s without event IDs as well.
Fixes https://github.com/vector-im/element-web/issues/16345
2021-02-03 15:18:19 +00:00
fd7c50f683
Move route splitting inside route parsing
2021-02-03 14:05:22 +00:00
bd538823cf
Reset matrix-js-sdk back to develop branch
2021-02-03 12:11:07 +00:00
9840ac6f17
Resetting package fields for development
2021-02-03 12:10:42 +00:00
b770d8d214
Merge branch 'master' into develop
2021-02-03 12:10:13 +00:00
11f80be0f7
v3.13.0
2021-02-03 12:07:42 +00:00
379c485ff8
Prepare changelog for v3.13.0
2021-02-03 12:07:41 +00:00
41c18d0d24
Upgrade matrix-js-sdk to 9.6.0
2021-02-03 12:02:50 +00:00
00059c49ab
Merge pull request #5613 from 2580ayush2580/ayush25809
...
Fix "Terms and Conditions" checkbox alignment
2021-02-03 10:53:58 +00:00
9a131efc1a
Fix avatar alignment
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-03 08:16:07 +01:00
eee9cf153b
Fix trash alignment
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-03 08:15:59 +01:00
af0b009600
Fix term_policy aligned to the center
2021-02-03 00:05:55 +05:30
c64d158183
Merge pull request #5611 from matrix-org/jryans/flair-height
...
Fix flair height after accent changes
2021-02-02 11:10:02 -07:00
560a7192cd
Merge pull request #5612 from matrix-org/jryans/flair-height-release
...
[Release] Fix flair height after accent changes
2021-02-02 11:09:58 -07:00
4136a62be2
Fix flair height after accent changes
...
The accent changes in https://github.com/matrix-org/matrix-react-sdk/pull/5569
led to a regression in flair display where the bottom edge was clipped.
Fixes https://github.com/vector-im/element-web/issues/16350
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/5569
2021-02-02 18:00:23 +00:00
388e23b40b
Fix flair height after accent changes
...
The accent changes in https://github.com/matrix-org/matrix-react-sdk/pull/5569
led to a regression in flair display where the bottom edge was clipped.
Fixes https://github.com/vector-im/element-web/issues/16350
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/5569
2021-02-02 17:57:22 +00:00
6eee6cf8cb
Merge pull request #5610 from matrix-org/t3chguy/cherrypick/5609
...
[Release] Iterate Social Logins work around edge cases and branding
2021-02-02 17:40:41 +00:00
45776a4144
Merge pull request #5609 from matrix-org/t3chguy/social-branding
...
Iterate Social Logins work around edge cases and branding
2021-02-02 17:40:37 +00:00
b83de3301b
Update SSO Twitter social branding to match guidelines
2021-02-02 17:32:05 +00:00
842fe36c7e
Fix register exploding if the server is down or we just don't have flows
2021-02-02 17:32:05 +00:00
J. Ryan Stinnett