Michael Telatynski
e644ede09e
Fix edge case around event list summary layout ( #7867 )
2022-02-22 10:25:44 +00:00
Michael Telatynski
57595bc593
Fix misalignment with Event List Summaries ( #7865 )
...
* Fix misalignment with Event List Summaries
* simplify styling
2022-02-22 08:35:58 +00:00
Kerry
6fccd6b183
add cursor: pointer to actionable poll options ( #7826 )
...
* add cursor: pointer to actionable poll options
Signed-off-by: Kerry Archibald <kerrya@element.io>
* eof
Signed-off-by: Kerry Archibald <kerrya@element.io>
2022-02-18 11:43:07 +01:00
Andy Balaam
84e15fa148
Display '(edited)' next to edited polls ( #7789 )
2022-02-15 08:52:51 +00:00
Andy Balaam
76cafb7aa9
Ensure location bodies have a width in bubbles ( #7742 )
2022-02-08 12:59:08 +00:00
Šimon Brandner
c52eaa53ce
Remove weird padding on stickers ( #6271 )
2022-02-08 08:27:37 +00:00
Andy Balaam
afbc843157
Fit location into the width of the container ( #7705 )
2022-02-02 11:41:33 +00:00
Eric Eastwood
9b0da552e7
Fix vertical spacing in compact
<ContextMenu>
( #7684 )
...
Fix https://github.com/vector-im/element-web/issues/20801
Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/7339
Relevant styles were first added in https://github.com/matrix-org/matrix-react-sdk/pull/4858
(context behind why the original styles were added)
---
## Cause
Battling CSS specificity between the default and compact styles, https://specificity.keegan.st/
Known good (On `app.element.io` (expected)):
```css
// 0 3 0
.mx_IconizedContextMenu .mx_IconizedContextMenu_optionList .mx_AccessibleButton {
padding-top: 12px;
padding-bottom: 12px;
}
// Compact styles override our default rules because they come
// after the other styles (source order) and have the same specificity
// 0 3 0
.mx_IconizedContextMenu.mx_IconizedContextMenu_compact .mx_IconizedContextMenu_optionList > * {
padding: 8px 16px 8px 11px;
}
```
Bad (On `develop` (broken)):
```css
// Default rules always override because they have higher specificity.
// The `:not()` selector doesn't add any extra specificity but the selectors inside the `:not(...)` do.
// 0 4 0
.mx_IconizedContextMenu .mx_IconizedContextMenu_optionList .mx_AccessibleButton:not(.mx_AccessibleButton_hasKind) {
padding-top: 12px;
padding-bottom: 12px;
}
// 0 3 0
.mx_IconizedContextMenu.mx_IconizedContextMenu_compact .mx_IconizedContextMenu_optionList > * {
padding: 8px 16px 8px 11px;
}
```
2022-02-01 11:23:21 -06:00
Eric Eastwood
7fa27f5834
Add jump to date functionality to date headers in timeline v2 ( #7339 )
...
Fix https://github.com/vector-im/element-web/issues/7677
Utilizes MSC3030: https://github.com/matrix-org/matrix-doc/pull/3030
https://user-images.githubusercontent.com/558581/150060664-79627573-f4fd-497c-b726-dc3485854bd0.png
2022-01-27 16:32:12 -06:00
Michael Telatynski
fb49ccce35
Show bubble tile timestamps for bubble layout inside the bubble ( #7622 )
2022-01-25 13:10:17 +00:00
Germain
336217f668
Add view in room to action bar in thread list ( #7519 )
2022-01-19 10:39:33 +00:00
Andy Balaam
2743a75a21
Display general marker on non-self location shares ( #7574 )
2022-01-19 09:33:49 +00:00
David Teller
6b870ba1a9
MSC3531 - Implementing message hiding pending moderation ( #7518 )
...
Signed-off-by: David Teller <davidt@element.io>
2022-01-17 16:04:37 +01:00
Kerry
fed53a268b
A11y - fix anchors-as-buttons ( #7444 )
...
* add link_inline accessiblebutton variant
* valid anchors in SecurityRoomSettingsTab
Signed-off-by: Kerry Archibald <kerrya@element.io>
* new room intro link button
Signed-off-by: Kerry Archibald <kerrya@element.io>
* replace anchor with button in rerequest encryption keys message
Signed-off-by: Kerry Archibald <kerrya@element.io>
* inline button in UrlPreviewSettings
Signed-off-by: Kerry Archibald <kerrya@element.io>
* ButtonResetDefault mixin
Signed-off-by: Kerry Archibald <kerrya@element.io>
* inline link buttons in TextForEvent
Signed-off-by: Kerry Archibald <kerrya@element.io>
* fix anchors in InviteDialog
Signed-off-by: Kerry Archibald <kerrya@element.io>
* fix anchors in DevToolsDialog
Signed-off-by: Kerry Archibald <kerrya@element.io>
* fix anchors in login/registration/reset pword flows
Signed-off-by: Kerry Archibald <kerrya@element.io>
* fix types after fixing anchors in devtools
Signed-off-by: Kerry Archibald <kerrya@element.io>
* fix anchors in MemberEventListSummary
Signed-off-by: Kerry Archibald <kerrya@element.io>
* fix anchors in ReactionsRow and RoomUpgrade
Signed-off-by: Kerry Archibald <kerrya@element.io>
* fix anchors in ReplyChain
Signed-off-by: Kerry Archibald <kerrya@element.io>
* fix more anchors
Signed-off-by: Kerry Archibald <kerrya@element.io>
* fix anchors in auth comps
* stylelint fixes
Signed-off-by: Kerry Archibald <kerrya@element.io>
* remove ignore of jsx-a11y rule that is not added yet
Signed-off-by: Kerry Archibald <kerrya@element.io>
* devtools style important explainer
Signed-off-by: Kerry Archibald <kerrya@element.io>
* translate button alt in devtools dialog
Signed-off-by: Kerry Archibald <kerrya@element.io>
* AccessibleButton is reactionsrow
Signed-off-by: Kerry Archibald <kerrya@element.io>
* fix viewsourcevent button placement, use AccessibleButton
Signed-off-by: Kerry Archibald <kerrya@element.io>
* use AccessibleButton in EventTile
Signed-off-by: Kerry Archibald <kerrya@element.io>
* unignore jsx-a11y/anchor-is-valid
Signed-off-by: Kerry Archibald <kerrya@element.io>
* fix lint issue in test jsx
Signed-off-by: Kerry Archibald <kerrya@element.io>
* update coment
Signed-off-by: Kerry Archibald <kerrya@element.io>
2022-01-07 10:40:53 +01:00
Andy Balaam
70dc03552c
Display the user's avatar when they shared their location ( #7424 )
2021-12-21 15:19:27 +00:00
Andy Balaam
68ac578577
Support reactions, replies and forwards of polls ( #7318 )
2021-12-09 12:54:31 +00:00
Andy Balaam
2b52e17a80
Allow ending polls ( #7305 )
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-12-08 14:56:48 +00:00
Matthew Hodgson
1262021417
Simple static location sharing ( #7135 )
...
Adds maplibre as a dependency, and behind a labs flag, lets users send and receive [MSC3488](https://github.com/matrix-org/matrix-doc/blob/matthew/location/proposals/3488-location.md ) style location shares - with backwards compatibility with old school `m.location` `msgtype` location shares too.
For this to work, you have to define a valid maptile server and API in your config.json's `map_style_url`.
2021-12-06 09:45:12 +00:00
Šimon Brandner
390dde055a
Task/colors-13 ( #7271 )
2021-12-03 09:23:38 +00:00
Šimon Brandner
9db0ebb7f5
Task/colors 11 ( #7211 )
2021-11-29 12:52:09 +00:00
Andy Balaam
359962af6c
Prevent text overlapping on poll options ( #7187 )
2021-11-23 11:16:31 +00:00
Andy Balaam
d705fdd6e4
Display and send votes in polls ( #7158 )
...
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-11-23 10:27:44 +00:00
Matthew Hodgson
e0927f3fc8
s/boarder/border/g ( #7174 )
2021-11-21 18:56:25 +01:00
Travis Ralston
3c06e7f7a0
Add option to change the size of images/videos in the timeline ( #7017 )
...
Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
Co-authored-by: Timo K <toger5@hotmail.de>
2021-11-17 15:19:30 +00:00
Timo
556cfc7ed8
Add maximise widget functionality ( #7098 )
...
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-11-16 15:43:18 +01:00
Šimon Brandner
4eadb3bca1
Color cleanup number 10 ( #7132 )
2021-11-16 10:10:44 +00:00
Andy Balaam
f87e9d86a4
Catch up MPollBody CSS with everything else that now uses just 'accent' ( #7118 )
2021-11-11 14:34:55 +00:00
Šimon Brandner
9abb2f5ff4
Color cleanup 8 ( #7108 )
...
* $accent-color -> $accent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $accent-bg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $notice-primary-color -> $alert
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $notice-primary-bg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $accent-50pct
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $warning-color -> $alert
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $accent-darker
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $orange-warning-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $warning-bg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $info-bg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-11-11 13:37:29 +00:00
Andy Balaam
431b69ee49
Display started polls in timeline (without votes) (behind labs setting) ( #7088 )
...
* Display started polls in timeline (without votes)
* Update i18n info
* Keep original background colour of poll options, even on hover
* Show full avatar above a poll message
2021-11-10 15:44:57 +00:00
Šimon Brandner
71d8946641
Color cleanup number 7 ( #7094 )
...
* $reaction-row-button-selected-border-color -> $accent-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $reaction-row-button-bg-color -> $header-panel-bg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $room-warning-bg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $button-link-bg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $tab-label-icon-bg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $tab-label-bg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $event-redacted-border-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $event-redacted-fg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $panel-divider-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $search-placeholder-color -> #61708b
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $search-bg-color -> #181b21
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $header-panel-border-color -> #000000
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $scrollbar-track-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $eventbubble-avatar-outline -> $background
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-11-10 09:46:33 +00:00
Šimon Brandner
5c66bd6c7b
Add max-empty-lines
and no-eol-whitespace
to stylelint ( #7034 )
2021-10-26 08:23:23 +01:00
Šimon Brandner
0794be1e98
$notice-secondary-color -> $tertiary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:21:27 +02:00
Dariusz Niemczyk
17f59131d8
Merge pull request #6868 from SimonBrandner/task/colors-3-mk2
...
Color clean-up #3 mk2
2021-10-01 11:04:15 +02:00
Dariusz Niemczyk
0cfa2a58c7
Add ability to expand and collapse long quoted messages ( #6701 )
...
In case where we had a very long message the experience of going between
messages to see the full quote isn't very nice on desktop, therefore this commit
adds a button with additional hotkey to normalize the experience a bit.
Fixes https://github.com/vector-im/element-web/issues/18884
2021-09-27 12:20:37 +02:00
Šimon Brandner
71d1196692
Get rid of message-body-panel colors
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-27 09:04:51 +02:00
Germain Souquet
77a463e679
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-25 08:53:16 +01:00
Šimon Brandner
2920da8b8b
Fix a merge regression
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-24 09:33:16 +02:00
Šimon Brandner
b6ea75b681
Merge remote-tracking branch 'upstream/develop' into task/colors-2
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-24 08:57:12 +02:00
Germain Souquet
9facb0d963
Polish UI
2021-08-23 14:44:44 +01:00
Germain Souquet
393bd4871f
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-23 10:15:35 +01:00
Travis Ralston
fcf47f6539
Merge pull request #6626 from SimonBrandner/fix/correct-colors-call-tiles
...
Adjust colors in call tiles
2021-08-20 00:02:56 -06:00
Germain Souquet
ffc7326b0c
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-19 10:44:32 +01:00
Dariusz Niemczyk
7adfbf6f98
Show blurhash only after 150ms
...
Blurhash on every single room entrance was extremely annoying, to the
point where it wasn't really helpful, but distracting, even after
the animations was added.
This commit makes it so the blurhash is only shown after 150ms, and the
image will be animated as a quick fade-in if there's no blurhash.
Fixes https://github.com/vector-im/element-web/issues/18617
Fixes https://github.com/vector-im/element-web/issues/17879
2021-08-19 07:52:23 +02:00
David Baker
5fa0908752
Merge pull request #6624 from SimonBrandner/fix/call-tile-button/18565
...
Fix call tile buttons
2021-08-18 12:03:18 +01:00
Germain Souquet
95f4513bd2
Make UI respond to thread events
2021-08-17 17:42:47 +01:00
Germain Souquet
458f860a26
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-17 11:14:21 +01:00
Šimon Brandner
d8f58e95cb
Use the secondary color for all
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-16 18:41:21 +02:00
Šimon Brandner
93fee442e6
Fix call tile buttons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-16 15:30:45 +02:00
Šimon Brandner
c856d433d6
Trim long display names
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-16 10:08:16 +02:00
Šimon Brandner
cda91e44e0
Use new call state icons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 11:37:17 +02:00
Šimon Brandner
c79852a9f0
Left align call tiles
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 10:59:59 +02:00
Šimon Brandner
5ac5640939
Add a little padding
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 10:35:31 +02:00
Šimon Brandner
39bb253d1f
Merge remote-tracking branch 'upstream/develop' into feature/narrow-voip-tiles/18398
2021-08-13 10:30:21 +02:00
Šimon Brandner
8b59bf3d18
$tertiary-fg-color -> $tertiary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:19:29 +02:00
Šimon Brandner
10bc85724a
$secondary-fg-color -> $secondary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:19:26 +02:00
Šimon Brandner
e5fd19c332
$primary-fg-color -> $primary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:18:18 +02:00
Šimon Brandner
2afee596a9
$primary-bg-color -> $background
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:17:34 +02:00
Dariusz Niemczyk
c872609ed3
Modify encrypted images loading for better UX
...
Adds proper react css transition to encrypted images placeholders, so
that we can animate it's entrance and exit properly.
In addition, adds simple css animations file to properly handle all of
the animations in one place, so that it's much easier to properly handle
prefers-reduced-motion media query.
2021-08-10 19:24:17 +02:00
Germain Souquet
d971802789
Create ThreadView phase in RightPanel
2021-08-10 14:30:12 +02:00
Šimon Brandner
efeae3a84c
Top align the avatar
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-05 13:39:39 +02:00
Šimon Brandner
5fa6ef83d2
Fix button alighnment
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-05 12:35:44 +02:00
Šimon Brandner
9e4f5719a4
Handle narrow layouts
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-05 11:47:58 +02:00
Travis Ralston
dd53324981
Merge pull request #6509 from matrix-org/travis/voice-messages/download-2
...
Improve download interactions
2021-07-30 10:50:27 -06:00
Germain
375f7b670a
Merge branch 'develop' into gsouquet/fix-18144
2021-07-30 08:10:15 +01:00
Travis Ralston
fb89b45c06
Unify and improve download interactions
...
With help from Palid.
This does two major things:
1. Makes the tile part of a file body clickable to trigger a download.
2. Refactors a lot of the recyclable code out of the DownloadActionButton in favour of a utility. It's not a perfect refactoring, but it sets the stage for future work in the area (if needed).
The refactoring still has a heavy reliance on being supplied an iframe, but simplifies the DownloadActionButton and a hair of the MFileBody download code. In future, we'd probably want to make the iframe completely managed by the FileDownloader rather than have it only sometimes manage a hidden iframe.
2021-07-29 15:36:50 -06:00
Germain Souquet
e140dd6ba1
Merge branch 'develop' into gsouquet/fix-18132
2021-07-29 10:27:00 +02:00
Germain Souquet
ee7f3c000d
Merge branch 'develop' into gsouquet/fix-18144
2021-07-29 10:04:47 +02:00
Germain Souquet
486d576b23
Merge branch 'develop' into gsouquet/fix-18132
2021-07-26 15:49:55 +02:00
Germain Souquet
2577211855
Make CallEvent tiles the same width all the time
2021-07-26 09:42:17 +02:00
Šimon Brandner
aedd535c92
Correct iconography for missed calls
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 08:37:25 +02:00
Michael Telatynski
4fe0e216d6
Use div instead of span for mx_MImageBody to not violate spec
2021-07-23 16:22:35 +01:00
Michael Telatynski
5f2582395f
Fix blurhash rounded corners missing regression
2021-07-23 16:21:59 +01:00
Germain Souquet
0768f03097
Migrate ViewSourceEvent to TypeScript
2021-07-22 17:11:23 +02:00
Travis Ralston
87ac2d7cc5
Move padding and width to MediaBody styles
2021-07-21 14:47:02 -06:00
Travis Ralston
3023fda497
Make MFileBody inherit the MediaBody styles
2021-07-21 14:46:25 -06:00
Travis Ralston
5386d23008
Fix voice message tile taking up a couple extra px at the bottom
...
... by returning it to the default block shape.
2021-07-21 14:43:26 -06:00
Germain Souquet
a7cd5fc49b
Shift thumbnail dislay to use object-fit to preserve aspect-ratio
2021-07-21 10:03:10 +02:00
Travis Ralston
5994111e5d
Merge remote-tracking branch 'origin/develop' into travis/voice-messages/download
2021-07-20 08:55:53 -06:00
Šimon Brandner
dd6379cf4b
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:15:04 +02:00
Germain
53ae7817bc
Merge pull request #6291 from matrix-org/gsouquet/message-bubbles-4635
2021-07-20 10:22:41 +01:00
Germain Souquet
06c9a060b4
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-20 10:16:21 +02:00
Šimon Brandner
5db20d9431
Fix placeholder centering
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 08:54:32 +02:00
Travis Ralston
31d7de628e
Small tweaks
2021-07-16 16:04:23 -06:00
Travis Ralston
b57fff5739
Update visual style and sandbox properly
2021-07-16 15:55:07 -06:00
Šimon Brandner
16ed5c6645
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 21:43:33 +02:00
Šimon Brandner
68640a4dbd
Fix icon postion
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-15 15:16:05 +02:00
Šimon Brandner
f26c75bdcc
Use margin instead of padding
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 10:23:10 +02:00
Šimon Brandner
18355599e8
Fix senderProfile getting cutoff
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 10:07:41 +02:00
Šimon Brandner
866a11d7e3
Fix image alignment issues
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 11:49:49 +02:00
Šimon Brandner
722c360de0
Use the correct color for silence button
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 14:42:05 +02:00
Šimon Brandner
2615ea7f3f
Add icons to buttons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 14:35:06 +02:00
Šimon Brandner
9ec3d93402
Better handling of call types
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 14:19:02 +02:00
Šimon Brandner
6f1fc3fc7e
Fix call button spacing issues
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 13:43:59 +02:00
Germain Souquet
10bdb3cefa
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-07 13:07:43 +02:00
Šimon Brandner
e582b1559b
Fix redacted messages (again)
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 15:09:02 +02:00
Šimon Brandner
0fe10e4502
Fix replies to deleted messages
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 14:22:46 +02:00
Šimon Brandner
b014763cd2
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 13:14:14 +02:00
Tulir Asokan
5240209529
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2021-07-02 12:39:51 +03:00
Michael Telatynski
1f337b28ac
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash
...
Conflicts:
src/ContentMessages.tsx
src/components/structures/UploadBar.tsx
src/components/views/messages/MImageBody.js
src/components/views/messages/MStickerBody.js
src/components/views/messages/MVideoBody.tsx
2021-07-01 20:48:34 +01:00
David Baker
5e3c8fae5c
put this just on the buttons
2021-07-01 15:22:44 +01:00