2b99afc741
i18n
2021-06-08 17:05:56 +01:00
f34a2e61bc
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365
2021-06-08 16:54:49 +01:00
34cc494a8e
Merge pull request #6140 from matrix-org/t3chguy/fix/17553
2021-06-08 16:45:35 +01:00
93eb9feaa7
iterate PR based on feedback
2021-06-08 16:42:58 +01:00
f84ee22769
Add comment
2021-06-08 16:36:53 +01:00
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
90a58380fd
Make it translateable
...
And also the other one that I copied from
2021-06-08 16:15:20 +01:00
26a030abcd
Better handling for widgets that fail to load
2021-06-08 12:40:38 +01:00
432373a00e
Merge pull request #5999 from robintown/improved-forwarding-ui
2021-06-08 10:52:06 +01:00
826d56585e
Merge pull request #6118 from aaronraimist/share-room
2021-06-08 09:03:49 +01:00
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
b00ad63a35
Fix whitespace nitpick
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-07 19:16:00 -04:00
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
b97867271b
Merge branch 'develop' into improved-forwarding-ui
2021-06-07 19:09:36 -04:00
946416cf87
Make serverCandidates optional
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-06-07 17:09:56 -05:00
9fdbd4c120
Merge branch 'develop' into share-room
2021-06-07 17:00:44 -05:00
65cc42b555
Merge pull request #6160 from robintown/fix-setting-watchers
2021-06-07 22:56:39 +01:00
773af6c7be
Fix test
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-06-07 16:54:53 -05:00
a5bf17ff65
Revert incorrect change to forShareableRoom
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-06-07 16:54:41 -05:00
ced6c43147
Merge pull request #6152 from matrix-org/t3chguy/fix/17571
...
Fix Stickerpicker context menu
2021-06-07 22:21:19 +01:00
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
8ccdf9a3e8
Reset matrix-js-sdk back to develop branch
2021-06-07 17:43:27 +01:00
bcd0ba8d45
Resetting package fields for development
2021-06-07 17:42:46 +01:00
7e03d03ba2
Merge branch 'master' into develop
2021-06-07 17:42:46 +01:00
a3dac02e4c
v3.23.0
2021-06-07 17:41:18 +01:00
2983b3ace2
Prepare changelog for v3.23.0
2021-06-07 17:41:18 +01:00
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
187a367111
Add prop to alwaysShowTimestamps on TimelinePanel
2021-06-07 17:11:14 +01:00
dd089bf969
Upgrade matrix-js-sdk to 11.2.0
2021-06-07 17:03:05 +01:00
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
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
9419dd9840
Merge pull request #6157 from matrix-org/jryans/notif-timestamp
...
Fix notif panel timestamp padding
2021-06-07 16:40:22 +01:00
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
6d80cd5913
Merge pull request #6149 from SimonBrandner/fix/jumps-image-view
2021-06-07 15:19:45 +01:00
20a3dd67d6
Some more styling
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 16:12:06 +02:00
255f996710
landscape -> imageIsNotFlipped
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 15:46:03 +02:00
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
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
0918ebad0a
calculateZoomAndRotate -> setZoomAndRotation
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 15:28:37 +02:00
5880cb3b5f
Better wording
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 15:26:54 +02:00
67c9fe1e07
Revert "Update curly braces styling"
...
This reverts commit ba0f6766ca
2021-06-07 15:25:57 +02:00
f3aa505673
Add warning to private space creation flow
2021-06-07 14:14:31 +01:00
bd8fd77d54
Merge pull request #6148 from robintown/fix-timestamps
2021-06-07 13:12:11 +01:00
b60feab7d2
Merge pull request #6147 from robintown/easier-image-panning
2021-06-07 12:47:43 +01:00
a3a6f3fa31
Merge pull request #6154 from matrix-org/gsouquet/fix-files-scroll-token
2021-06-07 12:44:59 +01:00
7abf680e51
Merge pull request #6153 from matrix-org/t3chguy/ts/123
2021-06-07 12:40:41 +01:00
ea6904ce2a
Fix local echo comment for scroll tokens
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-06-07 12:37:11 +01:00
d111f4cbb1
Merge branch 'develop' into gsouquet/fix-files-scroll-token
2021-06-07 12:25:08 +01:00
6693c39709
make event list summary a list item
2021-06-07 12:17:29 +01:00
4cc95dd184
Make skinning less upset
2021-06-07 11:20:35 +01:00
Michael Telatynski