mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 16:21:32 +03:00
Code Issues Projects Releases Packages Wiki Activity
35015 commits 219 branches 562 tags 474 MiB
Commit graph

2017 commits

Author SHA1 Message Date
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
Tulir Asokan
059241b5cc Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-06-07 19:26:12 +03: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
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
Michael Telatynski
b2b95257a8 Convert RoomAliasField to Typescript 2021-06-07 08:54:41 +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
Robin Townsend
a06306d560 Merge branch 'develop' into improved-forwarding-ui 2021-06-05 11:04:17 -04:00
Germain
7f83590846
Merge pull request #6079 from matrix-org/gsouquet/switch-rooms 2021-06-03 08:44:01 +01:00
Germain
9d126c51e4
Merge pull request #6113 from matrix-org/gsouquet/improve-layout-rendering 2021-06-02 11:41:59 +01:00
Michael Telatynski
bc3c759feb Add temporary mechanism for managing communities without dnd 2021-06-02 11:33:25 +01:00
Robin Townsend
56714525f2 Merge branch 'develop' into improved-forwarding-ui 2021-06-01 17:28:55 -04:00
Michael Telatynski
0b7d3f007a Remove react-beautiful-dnd 2021-06-01 17:35:31 +01:00
Germain Souquet
73ca6b2ad0 Add passive flag to Tooltip scroll event listener 2021-06-01 14:14:02 +01:00
Michael Telatynski
f11a7083ae Switch to stable endpoint/fields for MSC2858 2021-06-01 11:01:09 +01:00
Germain Souquet
c7c6a818f0 Merge branch 'develop' into gsouquet/switch-rooms 2021-05-26 09:51:27 +01:00
Germain
1751b4ba43
Merge pull request #6092 from matrix-org/gsouquet/window-dimensions-reflow 2021-05-25 12:00:08 +01:00
Germain Souquet
f156c2db15 prevent reflow in app when accessing window dimensions 2021-05-25 10:28:43 +01:00
Germain Souquet
a57887cc61 Prevent layout trashing on EffectsOverlay 2021-05-25 10:28:32 +01:00
Germain Souquet
fdc22bfdf7 Adhere to TypeScript codestyle better 2021-05-24 16:40:55 +01:00
Germain Souquet
19569f3897 Convert Tooltip to TypeScript 2021-05-24 15:01:59 +01:00
Germain Souquet
d6bc1861ae Migrate InlineSpinner to TypeScript 2021-05-24 14:33:31 +01:00
Robin Townsend
7a04502151 Iterate on forward dialog design feedback 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-21 12:41:29 -04:00
Germain Souquet
47e007e08f batch load events in ReplyThread before adding them to the state 2021-05-21 10:20:24 +01:00
Robin Townsend
332412782e Remove logo spinner 
Removed since design wants to avoid associating slowness with the brand.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-20 17:31:10 -04:00
Travis Ralston
767c7a1e38
Merge pull request #5680 from robintown/better-spinners 
Vectorize spinners
 2021-05-20 13:31:35 -06:00
Germain Souquet
229c4b98b4 use userGroups cached value to avoid re-render 2021-05-20 18:02:03 +01:00
Germain Souquet
f058fd8869 Reduce amount of DOM nodes 2021-05-20 15:39:25 +01:00
Germain Souquet
8f945ce846 Render nothin rather than an empty div 2021-05-19 11:57:32 +01:00
Michael Telatynski
bf01ebae6d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash 
 Conflicts:
	package.json
	src/components/views/messages/MImageBody.js
	yarn.lock
 2021-05-18 13:48:40 +01:00
Michael Telatynski
afd9843722 Fix broken string interpolation in chat effects warning 2021-05-18 10:28:37 +01:00
Robin Townsend
555b2e3266 Reuse Spinner styles for InlineSpinner 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-16 08:00:54 -04:00
Robin Townsend
74cc00b319 Merge branch 'develop' into better-spinners 2021-05-16 07:47:34 -04:00
Travis Ralston
89933d779c Merge branch 'develop' into travis/msc2873 2021-05-14 14:22:53 -06:00
Travis Ralston
6df079a5bd
Merge pull request #6033 from matrix-org/travis/rel-imageview 
Add missing 'rel' to image view download button
 2021-05-14 08:12:11 -06:00
Jaiwanth
26dd6d5510 Swap rotate left and right buttons 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-05-14 08:26:29 +05:30
Travis Ralston
b9f775d969 Add missing 'rel' to image view download button 
We're supposed to have this on every link off-site.
 2021-05-13 20:55:14 -06:00
Travis Ralston
3aef3b72b5 Move language handling into languageHandler 2021-05-12 14:08:32 -06:00
Michael Telatynski
2e19c7fd24 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
 2021-05-11 13:40:28 +01:00
Robin Townsend
e46bc93178 Fall back to MXID when no display name is present 
MemberAvatar requires a display name, or else it refuses to render.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-08 21:22:31 -04:00
Robin Townsend
44b143c8c3 Match requested avatar size to displayed size 
Reduces the blurriness of avatars in the EventTilePreview.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-08 21:17:05 -04:00
Tulir Asokan
cc919452b5 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-05-07 00:07:51 +03:00
Šimon Brandner
7ad270928a
Simplifie code a bit 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-06 16:41:09 +02:00
Šimon Brandner
bb9803a94e
Don't try to use the event's metadata to calc the scale 
That has lead to https://github.com/vector-im/element-web/issues/17184

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-06 16:40:33 +02:00
Michael Telatynski
90538c95aa Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 2021-05-06 08:05:14 +01:00
Jaiwanth
3eea1b8369 Add cleanup functions for image view 2021-05-04 16:42:22 +05:30
Tulir Asokan
09f9916916 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-05-01 15:37:32 +03:00
Šimon Brandner
232b87a3b4
Improve formatting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-29 19:57:02 +02:00
Michael Telatynski
46d35411b4 Add animated mx_BetaDot atop the legacy Communities button 2021-04-27 17:01:22 +01:00
Šimon Brandner
46bfbbadf9
Enable indent rule and fix indent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-27 17:23:27 +02:00
Robin Townsend
3a62f6cdaa Merge branch 'develop' into better-spinners 2021-04-26 14:12:44 -04:00
Robin Townsend
d3db5fe77f Vectorize mini avatar uploader spinner 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-04-26 14:10:09 -04:00
J. Ryan Stinnett
cddcedcce2 Merge remote-tracking branch 'origin/develop' into jryans/convert-flow-to-ts 2021-04-26 15:57:28 +01:00
Šimon Brandner
1fcad1a634
Show zoom buttons only if zooming is enabled 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-26 15:47:58 +02:00
Šimon Brandner
53e8b5e6af
Merge branch 'image-view-zoom' of https://github.com/SimonBrandner/matrix-react-sdk into image-view-zoom 2021-04-26 15:01:47 +02:00
Šimon Brandner
3547d1f93b
Change cursor to default 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-26 15:01:06 +02:00
Šimon Brandner
e374fcfe91
Fix spelling 2021-04-26 13:49:29 +02:00
Šimon Brandner
dbca370497
Try to precalculate the zoom from width and height props 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-26 13:48:14 +02:00
Šimon Brandner
b741b3112a
If the image is small don't scale 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-26 13:47:06 +02:00
Šimon Brandner
33107a1f47
Fall back to natural height and width 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-26 13:30:14 +02:00
Šimon Brandner
c1a4204ad3
Use a ref instead of that ugly thing 
Sometimes I do really weird things and don't know why :D

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-26 13:11:41 +02:00
Šimon Brandner
0e312977e3
Rework zooming 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-24 10:36:53 +02:00
Šimon Brandner
90f2423eb7
Fix zoom step and coeficient 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-24 10:35:25 +02:00
Šimon Brandner
bcc6e5c5d5
Add some comments 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-24 09:41:46 +02:00
Šimon Brandner
9b7a9fc865
Use MAX_SCALE for maxZoom 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-24 09:24:25 +02:00
Šimon Brandner
dcc060f6f7
Use correct cursor when we can't zoom 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-24 09:00:15 +02:00
Šimon Brandner
e0e9ccbf95
Remove logline 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-24 08:38:13 +02:00
Šimon Brandner
57b34f8dbc
Get rid of onWindowResize() 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-24 08:37:51 +02:00
Šimon Brandner
f8af9831a9
Don't use percanteages 
I was an idiot to use them in the first place

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-24 08:35:45 +02:00
Šimon Brandner
4523b8c7b8
Add dynamic maxZoom and wire it all up 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-24 08:32:28 +02:00
Šimon Brandner
dad7a22055
Initial code for dynamic minZoom 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-24 08:03:39 +02:00
J. Ryan Stinnett
2344ddd164 Merge remote-tracking branch 'origin/develop' into jryans/convert-flow-to-ts 2021-04-23 17:19:52 +01:00
J. Ryan Stinnett
d7e6f4b4b5 Add basic types 2021-04-23 17:05:50 +01:00
J. Ryan Stinnett
c09d4f4a78
Merge pull request #5904 from SimonBrandner/normalize-wheel 
Add a WheelEvent normalization function
 2021-04-23 12:59:37 +01:00
Šimon Brandner
2e6397d8aa
Wire up normalizeWheelEvent() 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-22 14:56:35 +02:00
Michael Telatynski
23c61752cd Add comment 2021-04-22 09:08:25 +01:00
Michael Telatynski
60828913d2 Iterate the spaces face pile design 2021-04-22 08:13:03 +01:00
Germain Souquet
33eebb84a6 Ensure PersistedElement are unmounted on application logout 2021-04-19 17:57:20 +01:00
J. Ryan Stinnett
2d1615e433
Merge pull request #5872 from SimonBrandner/new-image-view-fixes 
New Image View fixes/improvements
 2021-04-19 17:37:42 +01:00
Tulir Asokan
b8ef67e447 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-04-19 13:37:27 +03:00
Šimon Brandner
2e31355741
Don't do anything if we didn't press the left button 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-15 08:10:03 +02:00
Šimon Brandner
72d8e6ccca
Decrease ZOOM_COEFFICIENT 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-15 08:09:14 +02:00
Travis Ralston
1aeb9a5fb2 Appease the linter 2021-04-14 22:04:18 -06:00
Travis Ralston
22219e0e80 Adapt <Tooltip> to use an Alignment enum instead 2021-04-14 21:13:09 -06:00
Travis Ralston
ac00c80efb
Merge pull request #5521 from SimonBrandner/improve-image-view 
Improve image view
 2021-04-13 19:01:27 -06:00
Šimon Brandner
f9fde3670d
Set target to _blank 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-13 08:15:42 +02:00
Šimon Brandner
b1091a22a3
Don't render context menu button if mxEvent is missing 
The button is useless and doesn't work if we're viewing an avatar

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-13 08:11:09 +02:00
J. Ryan Stinnett
8a1180bd50 Rename toggle to view 2021-04-12 13:19:13 +01:00
J. Ryan Stinnett
798a891d83 Tweak appearance of invite reason 
This adjusts the display of invite reasons to match design feedback.

Fixes https://github.com/vector-im/element-web/issues/16869
 2021-04-12 12:28:42 +01:00
Šimon Brandner
86dd81cda0
Fix rotation animation when rotating 360 deg 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-09 08:16:52 +02:00
Šimon Brandner
90f9d20f45
Add comment about refs to functional components 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-09 08:03:10 +02:00
Šimon Brandner
4a40f67e75
Make private 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-09 08:02:38 +02:00
Šimon Brandner
cb02c39d7f
Add name to copyright 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-09 08:01:14 +02:00
Šimon Brandner
88a881baec
ZOOM_DISTANCE into a const 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-03 16:19:22 +02:00
Šimon Brandner
fd8e785a5e
Why don't I convert this to Typescript while I am here? 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-03 16:14:27 +02:00
Šimon Brandner
429c945bbf
Don't allow translation when zoomed out 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-02 10:37:42 +02:00
Šimon Brandner
722178e26e
Don't return false 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-02 10:22:10 +02:00
Šimon Brandner
2ff34000fd
Reset translation with zoom out 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-02 10:16:42 +02:00
Šimon Brandner
7068996b60
Animate zooming 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-02 10:09:53 +02:00
Šimon Brandner
33a1006488
Iterate mouse actions and cursor behaviour 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-02 10:01:41 +02:00
Šimon Brandner
eb83ae0a9f
Use MIN_ZOOM in contructor 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-02 09:40:13 +02:00
Šimon Brandner
80854ab6bb
Don't show seconds in ImageView 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-02 09:25:21 +02:00
Šimon Brandner
535ae086b4
Make sender bold 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-02 08:31:42 +02:00
Šimon Brandner
e5a563f887
Close ImageView after forward click 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-02 08:17:05 +02:00
Šimon Brandner
9606297f7c
Merge branch 'develop' into improve-image-view 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-02 08:15:51 +02:00
Robin Townsend
2477258249 Merge branch 'develop' into show-invite-reasons 2021-03-31 16:13:29 -04:00
Robin Townsend
f0333b5b1c Show invite reasons 
Displays the reason for invitation in the invitation dialog, requiring a
click to reveal the message.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-03-31 15:46:09 -04:00
Tulir Asokan
c31967dc97 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-03-26 21:31:28 +02:00
Michael Telatynski
83612dd4ad
Merge pull request #5792 from matrix-org/t3chguy/spaces4.12 
Fixing spaces papercuts
 2021-03-26 15:01:31 +00:00
Michael Telatynski
eff0e6fcc3 Add facepile to Space landing page and tweak layout slightly 2021-03-26 13:11:57 +00:00
Michael Telatynski
4341dfb314 Iterate facepiles, fix default avatar alignment and sort explicit avatars first 2021-03-26 11:55:22 +00:00
Travis Ralston
8bc2356fd0 Fix crash on login when using social login 
We weren't passing a matrix client through, and the peg wasn't set at this point. Just need to thread it through to the media endpoints.

Fixes https://github.com/vector-im/element-web/issues/16765
 2021-03-25 22:22:43 -06:00
Michael Telatynski
09601f1071 Add display name tooltip to the facepile avatars 2021-03-26 00:05:05 +00:00
Michael Telatynski
ea77ab125e Show a face pile on a space preview 2021-03-25 16:15:34 +00:00
Michael Telatynski
03ab2dc8e0
Merge pull request #5776 from matrix-org/t3chguy/spaces4.10 
Improve discovery of rooms in a space
 2021-03-22 13:24:23 +00:00
Tulir Asokan
cdf8f09ec2 Remove unused import and run yarn i18n 2021-03-20 13:38:42 +02:00
Tulir Asokan
99717db762 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-03-19 21:58:30 +02:00
Michael Telatynski
d04c8b3fb4 Improve discovery of rooms in a space 2021-03-19 11:54:10 +00:00
Travis Ralston
be8ee1a576 Appease the linter 2021-03-18 21:05:51 -06:00
Travis Ralston
1d9d0cd7be Convert a bunch more js-sdk imports to absolute paths 
Turns out a lot of the typescript warnings about improper warnings were correct. TypeScript appears to be pulling in two copies of the js-sdk when we do this, which can lead to type conflicts (or worse: the wrong code entirely). We fix this at the webpack level by explicitly importing from `src`, but some alternative build structures have broken tests because of this - jest ends up pulling in the "wrong" js-sdk, breaking things.
 2021-03-18 20:50:34 -06:00
Šimon Brandner
c96d2621a0
Set max-width and MIN_ZOOM 
This might have some side effects but as far as I can tell they shouldn't be too problematic

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-16 19:57:14 +01:00
Šimon Brandner
8f6f9cd6fa
Remove some unnecessary CSS and set MIN_ZOOM to 95 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-15 20:37:39 +01:00
Šimon Brandner
e45035582d
Add ZOOM_COEFFICIENT with value of 10 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-15 19:28:21 +01:00
Šimon Brandner
7b6d393754
Add a missing space 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-15 19:24:44 +01:00
Šimon Brandner
67a57ead96
Export ZOOM_STEP into a variable 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-15 19:24:00 +01:00
Šimon Brandner
b27a8e3c3a
Merge branch 'develop' into improve-image-view 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-14 08:30:28 +01:00
Tulir Asokan
8c8b46b984 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-03-12 14:18:12 +02:00
Travis Ralston
af9f17219b Fix MemberAvatar crash from EventTilePreview 2021-03-10 12:32:18 -07:00
Travis Ralston
533c9fed64 Appease the linter 2021-03-10 12:32:18 -07:00
Travis Ralston
1ac12479ca Convert cases of mxcUrlToHttp to new media customisation 2021-03-10 12:32:18 -07:00
Travis Ralston
5b3367d44e Merge remote-tracking branch 'origin/develop' into travis/skinning/pt3-easy-comps 2021-03-09 09:33:19 -07:00