Skip to content

Commit

Permalink
Merge branch 'master' into vips-thumbnail
Browse files Browse the repository at this point in the history
  • Loading branch information
InfiniteStash authored Jan 24, 2025
2 parents 49b2965 + 571d2e3 commit 1f3e6fa
Show file tree
Hide file tree
Showing 17 changed files with 190 additions and 127 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ There are two ways to authenticate a user in Stash-box: a session or an API key.
| `host_url` | (none) | Base URL for the server. Used when sending emails. Should be in the form of `https://hostname.com`. |
| `image_location` | (none) | Path to store images, for local image storage. An error will be displayed if this is not set when creating non-URL images. |
| `image_backend` | (`file`) | Storage solution for images. Can be set to either `file` or `s3`. |
| `image_jpeg_quality` | `75` | Quality setting when resizing JPEG images. Valid values are 0-100. |
| `image_max_size` | (none) | Max size of image, if no size is specified. Omit to return full size. |
| `userLogFile` | (none) | Path to the user log file, which logs user operations. If not set, then these will be output to stderr. |
| `s3.endpoint` | (none) | Hostname to s3 endpoint used for image storage. |
Expand Down
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"stylelint-scss": "^6.9.0",
"typescript": "~5.6.3",
"typescript-eslint": "^8.15.0",
"vite": "^5.4.11",
"vite": "^5.4.12",
"vite-tsconfig-paths": "^5.1.3"
},
"dependencies": {
Expand Down
Loading

0 comments on commit 1f3e6fa

Please # to comment.