Travis Ralston
16ddf18e69
Merge pull request #6163 from matrix-org/dependabot/npm_and_yarn/trim-newlines-3.0.1
...
Bump trim-newlines from 3.0.0 to 3.0.1
2021-06-08 14:08:02 -06:00
dependabot[bot]
7155c033f2
Bump trim-newlines from 3.0.0 to 3.0.1
...
Bumps [trim-newlines](https://github.com/sindresorhus/trim-newlines ) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/sindresorhus/trim-newlines/releases )
- [Commits](https://github.com/sindresorhus/trim-newlines/commits )
---
updated-dependencies:
- dependency-name: trim-newlines
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-08 19:20:10 +00:00
Michael Telatynski
2938bfbadf
Merge pull request #6162 from matrix-org/t3chguy/fix/17596
...
Fix upgrade to element home button in top left menu
2021-06-08 17:48:45 +01:00
Michael Telatynski
90982f9b3f
Fix upgrade to element home button in top left menu
2021-06-08 17:31:08 +01:00
Michael Telatynski
2b99afc741
i18n
2021-06-08 17:05:56 +01:00
Michael Telatynski
f34a2e61bc
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365
2021-06-08 16:54:49 +01:00
Michael Telatynski
34cc494a8e
Merge pull request #6140 from matrix-org/t3chguy/fix/17553
2021-06-08 16:45:35 +01:00
Michael Telatynski
93eb9feaa7
iterate PR based on feedback
2021-06-08 16:42:58 +01:00
Michael Telatynski
f84ee22769
Add comment
2021-06-08 16:36:53 +01:00
David Baker
399be4fa5d
Merge pull request #6161 from matrix-org/dbkr/widget_load_error
...
Better handling for widgets that fail to load
2021-06-08 16:28:44 +01:00
David Baker
90a58380fd
Make it translateable
...
And also the other one that I copied from
2021-06-08 16:15:20 +01:00
Šimon Brandner
bf77a4a2ab
Merge remote-tracking branch 'upstream/develop' into show-username
2021-06-08 17:14:42 +02:00
Germain Souquet
5c62728d13
Migrate end to end tests pipeline to GitHub Actions
2021-06-08 12:52:32 +01:00
David Baker
26a030abcd
Better handling for widgets that fail to load
2021-06-08 12:40:38 +01:00
Michael Telatynski
432373a00e
Merge pull request #5999 from robintown/improved-forwarding-ui
2021-06-08 10:52:06 +01:00
Michael Telatynski
826d56585e
Merge pull request #6118 from aaronraimist/share-room
2021-06-08 09:03:49 +01:00
Robin Townsend
372f24ff99
Hide download links from forward dialog preview
...
since trying to interact with them is pointless.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-07 19:19:14 -04:00
Robin Townsend
b00ad63a35
Fix whitespace nitpick
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-07 19:16:00 -04:00
Robin Townsend
a8dab04d5e
Remove mystery dot from forward dialog preview
...
It was a bullet point, since EventTiles now get created as li by default
:P
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-07 19:10:45 -04:00
Robin Townsend
b97867271b
Merge branch 'develop' into improved-forwarding-ui
2021-06-07 19:09:36 -04:00
Aaron Raimist
946416cf87
Make serverCandidates optional
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-06-07 17:09:56 -05:00
Aaron Raimist
9fdbd4c120
Merge branch 'develop' into share-room
2021-06-07 17:00:44 -05:00
Michael Telatynski
65cc42b555
Merge pull request #6160 from robintown/fix-setting-watchers
2021-06-07 22:56:39 +01:00
Aaron Raimist
773af6c7be
Fix test
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-06-07 16:54:53 -05:00
Aaron Raimist
a5bf17ff65
Revert incorrect change to forShareableRoom
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-06-07 16:54:41 -05:00
Michael Telatynski
ced6c43147
Merge pull request #6152 from matrix-org/t3chguy/fix/17571
...
Fix Stickerpicker context menu
2021-06-07 22:21:19 +01:00
Michael Telatynski
801b5f9c1a
Merge pull request #6155 from matrix-org/t3chguy/spacesteammatewarning
...
Add warning to private space creation flow
2021-06-07 22:21:07 +01:00
Šimon Brandner
b39c615abc
Reorder
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 19:44:58 +02:00
Šimon Brandner
4185185cdc
Reduce number of DOM elements
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 19:42:48 +02:00
Šimon Brandner
025148d9fc
Merge branch 'develop' into show-username
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 19:37:22 +02:00
Tirifto
ed80db73d4
Translated using Weblate (Esperanto)
...
Currently translated at 99.9% (2978 of 2979 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/eo/
2021-06-07 17:34:41 +00:00
RiotRobot
8ccdf9a3e8
Reset matrix-js-sdk back to develop branch
2021-06-07 17:43:27 +01:00
RiotRobot
bcd0ba8d45
Resetting package fields for development
2021-06-07 17:42:46 +01:00
RiotRobot
7e03d03ba2
Merge branch 'master' into develop
2021-06-07 17:42:46 +01:00
RiotRobot
a3dac02e4c
v3.23.0
2021-06-07 17:41:18 +01:00
RiotRobot
2983b3ace2
Prepare changelog for v3.23.0
2021-06-07 17:41:18 +01:00
Germain
c6de1c3fc8
Merge pull request #6159 from matrix-org/gsouquet/fix-showtimestamps-notifpanel
...
Add prop to alwaysShowTimestamps on TimelinePanel
2021-06-07 17:21:19 +01:00
Germain Souquet
187a367111
Add prop to alwaysShowTimestamps on TimelinePanel
2021-06-07 17:11:14 +01:00
RiotRobot
dd089bf969
Upgrade matrix-js-sdk to 11.2.0
2021-06-07 17:03:05 +01:00
J. Ryan Stinnett
a06e7ca477
Merge pull request #6158 from matrix-org/jryans/notif-timestamp-release
...
[Release] Fix notif panel timestamp padding
2021-06-07 16:50:17 +01:00
J. Ryan Stinnett
296186b844
Fix notif panel timestamp padding
...
This restores some space around the timestamp in the notif panel. We were
previously relying somewhat randomly on the presence on empty flair elements to
create space.
Fixes https://github.com/vector-im/element-web/issues/17580
2021-06-07 16:46:08 +01:00
J. Ryan Stinnett
9419dd9840
Merge pull request #6157 from matrix-org/jryans/notif-timestamp
...
Fix notif panel timestamp padding
2021-06-07 16:40:22 +01:00
J. Ryan Stinnett
a895b083a2
Fix notif panel timestamp padding
...
This restores some space around the timestamp in the notif panel. We were
previously relying somewhat randomly on the presence on empty flair elements to
create space.
Fixes https://github.com/vector-im/element-web/issues/17580
2021-06-07 16:21:53 +01:00
Michael Telatynski
6d80cd5913
Merge pull request #6149 from SimonBrandner/fix/jumps-image-view
2021-06-07 15:19:45 +01:00
Šimon Brandner
20a3dd67d6
Some more styling
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 16:12:06 +02:00
Šimon Brandner
255f996710
landscape -> imageIsNotFlipped
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 15:46:03 +02:00
Šimon Brandner
b5d271759f
Why would I format this myself if eslint can do it for me?
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 15:43:43 +02:00
Šimon Brandner
2e47a1176f
Get rid of weird rotation prop
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 15:39:11 +02:00
Šimon Brandner
0918ebad0a
calculateZoomAndRotate -> setZoomAndRotation
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 15:28:37 +02:00
Šimon Brandner
5880cb3b5f
Better wording
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 15:26:54 +02:00