Commit graph

14491 commits

Author SHA1 Message Date
Šimon Brandner
bf77a4a2ab
Merge remote-tracking branch 'upstream/develop' into show-username 2021-06-08 17:14:42 +02:00
David Baker
26a030abcd Better handling for widgets that fail to load 2021-06-08 12:40:38 +01: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
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
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
Tulir Asokan
059241b5cc Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-06-07 19:26:12 +03:00
Germain Souquet
187a367111 Add prop to alwaysShowTimestamps on TimelinePanel 2021-06-07 17:11:14 +01:00
Michael Telatynski
4725a9e8fa Extract useRoomState hook into hooks directory 2021-06-07 16:42:59 +01:00
Michael Telatynski
a7eb09af1e Convert EditableItemList & AliasSettings to Typescript 2021-06-07 15:48:55 +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
6d2a7390d7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244 2021-06-07 14:15:49 +01:00
Michael Telatynski
f3aa505673 Add warning to private space creation flow 2021-06-07 14:14:31 +01: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
a3a6f3fa31
Merge pull request #6154 from matrix-org/gsouquet/fix-files-scroll-token 2021-06-07 12:44:59 +01:00
Germain
ea6904ce2a
Fix local echo comment for scroll tokens
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-06-07 12:37:11 +01:00
Germain Souquet
d111f4cbb1 Merge branch 'develop' into gsouquet/fix-files-scroll-token 2021-06-07 12:25:08 +01:00
Germain Souquet
6693c39709 make event list summary a list item 2021-06-07 12:17:29 +01:00
Michael Telatynski
ae04b2ce4a Fix Dialog/Modal types defn 2021-06-07 11:06:30 +01:00
Germain Souquet
a6ddffe74c Add scroll token to file and notif event tiles 2021-06-07 09:26:42 +01:00
Michael Telatynski
31d308a1fb Fix Stickerpicker context menu 2021-06-07 09:22:47 +01:00
Michael Telatynski
8c34a8461e Add way to specify address during public space creation 2021-06-07 08:57:39 +01:00
Michael Telatynski
b2b95257a8 Convert RoomAliasField to Typescript 2021-06-07 08:54:41 +01:00
Robin Townsend
1e574307d0 Cache lowBandwidth setting to speed up BaseAvatar
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-06 23:08:47 -04:00
Robin Townsend
903d4d252a Add optimized function to determine whether event has text to display
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-06 23:06:56 -04: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
e891d18fa2 Add my email to my copyright notices
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 21:41:28 -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
Robin Townsend
b06da16a85 Fix jumping to bottom without a highlighted event
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 13:20:27 -04:00