Michael Telatynski
9f20d6661d
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17605
...
Conflicts:
src/components/views/spaces/SpaceTreeLevel.tsx
2021-06-22 22:49:28 +01:00
Michael Telatynski
bbdc28f56d
Merge pull request #6241 from matrix-org/t3chguy/ts/7
2021-06-22 22:34:15 +01:00
Michael Telatynski
ffaa19ef2c
fix typing
2021-06-22 22:27:12 +01:00
Michael Telatynski
b3b9135b1f
Merge pull request #6134 from matrix-org/t3chguy/fix/17529
2021-06-22 21:28:51 +01:00
Travis Ralston
1180741cc2
Merge pull request #6000 from robintown/event-tile-preview-fixes
...
EventTilePreview fixes
2021-06-22 13:57:07 -06:00
Michael Telatynski
59052b1eb7
Merge pull request #6199 from matrix-org/t3chguy/fix/17665
2021-06-22 17:46:57 +01:00
Michael Telatynski
e3e6b74272
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665
...
Conflicts:
src/stores/SpaceStore.tsx
2021-06-22 17:38:05 +01:00
Michael Telatynski
59258585b3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/5
2021-06-22 17:28:19 +01:00
Germain
5b72423ea3
Merge pull request #6230 from matrix-org/gsouquet/fix-17051
2021-06-22 15:07:04 +01:00
Michael Telatynski
66b3feb802
Fix keyboard accessibility of the space panel
2021-06-22 11:50:00 +01:00
Germain Souquet
3d3c428455
Fix DesktopBuildsNotice return type
2021-06-22 10:26:49 +01:00
Germain Souquet
7825c30bf7
Improve event index initialisation failure message in search bar for supported platforms
2021-06-21 15:41:47 +01:00
Germain Souquet
adb42b7927
Deprecate FormButton to use AccessibleButton everywhere
2021-06-21 14:16:37 +01:00
Michael Telatynski
058cbbbd0c
Fix imports
2021-06-18 16:13:55 +01:00
Michael Telatynski
7d90612371
Iterate PR
2021-06-17 16:22:40 +01:00
Michael Telatynski
02e72d8b04
Fix more type definitions
2021-06-17 14:24:53 +01:00
Germain Souquet
1a08af8ccf
remove stray bullet point in reply preview
2021-06-17 08:45:09 +01:00
Robin Townsend
2750d64495
Merge branch 'develop' into event-tile-preview-fixes
2021-06-16 18:27:10 -04:00
Robin Townsend
79bf7bee56
Fix EventTilePreview display names
...
Because of 91df392a2a
, we now need to
additionally set rawDisplayName to properly fake our display name for an
event.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-16 18:23:44 -04:00
J. Ryan Stinnett
8f02ca8ce9
Stop requesting null next replies from the server
...
A recent change (47e007e08f
) introduced a
regression where we failed to check whether a reply thread has a next reply.
This meant that we would end up sending `/context/undefined` requests to the
server for every reply thread on every room view.
Fixes https://github.com/vector-im/element-web/issues/17563
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/6079
2021-06-16 18:04:41 +01:00
Michael Telatynski
a52dd57eb2
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17529
...
Conflicts:
package.json
yarn.lock
2021-06-15 13:59:54 +01:00
Germain Souquet
b1824ce579
fix HTML tag for Event Tile when not rendered in a list
2021-06-11 11:34: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
David Baker
26a030abcd
Better handling for widgets that fail to load
2021-06-08 12:40:38 +01:00
Robin Townsend
b97867271b
Merge branch 'develop' into improved-forwarding-ui
2021-06-07 19:09:36 -04:00
Robin Townsend
5e3ad62189
Remove mysterious dot from EventTilePreviews
...
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:03:04 -04:00
Robin Townsend
ea98499ca6
Merge branch 'develop' into event-tile-preview-fixes
2021-06-07 18:56:12 -04: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
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
Šimon Brandner
67c9fe1e07
Revert "Update curly braces styling"
...
This reverts commit ba0f6766ca
.
2021-06-07 15:25:57 +02:00
Michael Telatynski
bd8fd77d54
Merge pull request #6148 from robintown/fix-timestamps
2021-06-07 13:12:11 +01:00
Michael Telatynski
b60feab7d2
Merge pull request #6147 from robintown/easier-image-panning
2021-06-07 12:47:43 +01:00
Germain Souquet
6693c39709
make event list summary a list item
2021-06-07 12:17:29 +01:00
Michael Telatynski
31d308a1fb
Fix Stickerpicker context menu
2021-06-07 09:22:47 +01:00
Šimon Brandner
ba0f6766ca
Update curly braces styling
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-06 09:02:30 +02:00
Šimon Brandner
c3fdd73357
Avoid multiple setState() calls
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-06 08:56:12 +02:00
Šimon Brandner
28be581af1
Take image rotation into account when zooming
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-06 08:51:07 +02:00
Šimon Brandner
c0964b69b7
Remove redundant vars
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-06 08:14:43 +02:00
Šimon Brandner
1c8e341143
Reset all translation vars
...
Not doing this would result in jumps because everything would get out of sync
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-06 08:09:41 +02:00
Robin Townsend
ea2120bdfd
Fix timestamps
...
7f83590846
changed timestamps to be hidden
at the DOM level, not the CSS level. We can keep that approach, we just
need to ensure they still get shown at the right times.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-06 01:55:01 -04:00
Robin Townsend
51a18432fa
Merge branch 'develop' into event-tile-preview-fixes
2021-06-05 22:21:36 -04:00
Robin Townsend
43921500d3
Revert "Match requested avatar size to displayed size"
...
This reverts commit 44b143c8c3
.
2021-06-05 22:21:10 -04:00
Robin Townsend
17edfec3aa
Make it easier to pan images in the lightbox
...
Previously, if you were dragging an image and your cursor outpaced the
edge of the image as it was moving, panning would abruptly stop. This
moves a few of the lightbox event listeners one level up to the image
wrapper to ensure that all drag movements are detected, even if they
don't end over the image's current position.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 21:08:44 -04:00