Skip to content

Commit 25ac997

Browse files
committed
merge main
2 parents 5eccffc + ba6687d commit 25ac997

File tree

68 files changed

+10555
-1221
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+10555
-1221
lines changed

docs/docs/administration/backup-and-restore.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ By default, Immich will keep the last 14 database dumps and create a new dump ev
4141

4242
#### Trigger Dump
4343

44-
You are able to trigger a database dump in the [admin job status page](http://my.immich.app/admin/jobs-status).
44+
You are able to trigger a database dump in the [admin job status page](http://my.immich.app/admin/queues).
4545
Visit the page, open the "Create job" modal from the top right, select "Create Database Dump" and click "Confirm".
4646
A job will run and trigger a dump, you can verify this worked correctly by checking the logs or the `backups/` folder.
4747
This dumps will count towards the last `X` dumps that will be kept based on your settings.

docs/docs/administration/reverse-proxy.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ server {
2121
# allow large file uploads
2222
client_max_body_size 50000M;
2323
24+
# disable buffering uploads to prevent OOM on reverse proxy server and make uploads twice as fast (no pause)
25+
proxy_request_buffering off;
26+
2427
# Set headers
2528
proxy_set_header Host $host;
2629
proxy_set_header X-Real-IP $remote_addr;

docs/docs/developer/setup.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ You can access the web from `http://your-machine-ip:3000` or `http://localhost:3
4848
**Notes:**
4949

5050
- The "web" development container runs with uid 1000. If that uid does not have read/write permissions on the mounted volumes, you may encounter errors
51-
- In case of rootless docker setup, you need to use root within the container, otherwise you will encounter read/write permission related errors, see comments in `docker/docker-compose.dev.yml`.
5251

5352
#### Connect web to a remote backend
5453

docs/docs/features/searching.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1222,4 +1222,4 @@ Feel free to make a feature request if there's a model you want to use that we d
12221222
[huggingface-clip]: https://huggingface.co/collections/immich-app/clip-654eaefb077425890874cd07
12231223
[huggingface-multilingual-clip]: https://huggingface.co/collections/immich-app/multilingual-clip-654eb08c2382f591eeb8c2a7
12241224
[smart-search-settings]: https://my.immich.app/admin/system-settings?isOpen=machine-learning+smart-search
1225-
[job-status-page]: https://my.immich.app/admin/jobs-status
1225+
[job-status-page]: https://my.immich.app/admin/queues

docs/docs/guides/remote-machine-learning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Version mismatches between both hosts may cause bugs and instability, so remembe
5353

5454
Adding a new URL to the settings is recommended over replacing the existing URL. This is because it will allow machine learning tasks to be processed successfully when the remote server is down by falling back to the local machine learning container. If you do not want machine learning tasks to be processed locally when the remote server is not available, you can instead replace the existing URL and only provide the remote container's URL. If doing this, you can remove the `immich-machine-learning` section of the local `docker-compose.yml` file to save resources, as this service will never be used.
5555

56-
Do note that this will mean that Smart Search and Face Detection jobs will fail to be processed when the remote instance is not available. This in turn means that tasks dependent on these features—Duplicate Detection and Facial Recognition—will not run for affected assets. If this occurs, you must manually click the _Missing_ button next to Smart Search and Face Detection in the [Job Status](http://my.immich.app/admin/jobs-status) page for the jobs to be retried.
56+
Do note that this will mean that Smart Search and Face Detection jobs will fail to be processed when the remote instance is not available. This in turn means that tasks dependent on these features—Duplicate Detection and Facial Recognition—will not run for affected assets. If this occurs, you must manually click the _Missing_ button next to Smart Search and Face Detection in the [Job Status](http://my.immich.app/admin/queues) page for the jobs to be retried.
5757

5858
## Load balancing
5959

i18n/en.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"action_description": "A set of action to perform on the filtered assets",
99
"actions": "Actions",
1010
"active": "Active",
11+
"active_count": "Active: {count}",
1112
"activity": "Activity",
1213
"activity_changed": "Activity is {enabled, select, true {enabled} other {disabled}}",
1314
"add": "Add",
@@ -117,10 +118,9 @@
117118
"job_not_concurrency_safe": "This job is not concurrency-safe.",
118119
"job_settings": "Job Settings",
119120
"job_settings_description": "Manage job concurrency",
120-
"job_status": "Job Status",
121121
"jobs_delayed": "{jobCount, plural, other {# delayed}}",
122122
"jobs_failed": "{jobCount, plural, other {# failed}}",
123-
"jobs_page_description": "Admin jobs page",
123+
"jobs_over_time": "Jobs over time",
124124
"library_created": "Created library: {library}",
125125
"library_deleted": "Library deleted",
126126
"library_details": "Library details",
@@ -283,10 +283,14 @@
283283
"password_settings_description": "Manage password login settings",
284284
"paths_validated_successfully": "All paths validated successfully",
285285
"person_cleanup_job": "Person cleanup",
286+
"queue_details": "Queue Details",
287+
"queues": "Job Queues",
288+
"queues_page_description": "Admin job queues page",
286289
"quota_size_gib": "Quota Size (GiB)",
287290
"refreshing_all_libraries": "Refreshing all libraries",
288291
"registration": "Admin Registration",
289292
"registration_description": "Since you are the first user on the system, you will be assigned as the Admin and are responsible for administrative tasks, and additional users will be created by you.",
293+
"remove_failed_jobs": "Remove failed jobs",
290294
"require_password_change_on_login": "Require user to change password on first login",
291295
"reset_settings_to_default": "Reset settings to default",
292296
"reset_settings_to_recent_saved": "Reset settings to the recent saved settings",
@@ -1122,6 +1126,7 @@
11221126
"external_network_sheet_info": "When not on the preferred Wi-Fi network, the app will connect to the server through the first of the below URLs it can reach, starting from top to bottom",
11231127
"face_unassigned": "Unassigned",
11241128
"failed": "Failed",
1129+
"failed_count": "Failed: {count}",
11251130
"failed_to_authenticate": "Failed to authenticate",
11261131
"failed_to_load_assets": "Failed to load assets",
11271132
"failed_to_load_folder": "Failed to load folder",
@@ -2263,6 +2268,7 @@
22632268
"visual": "Visual",
22642269
"visual_builder": "Visual builder",
22652270
"waiting": "Waiting",
2271+
"waiting_count": "Waiting: {count}",
22662272
"warning": "Warning",
22672273
"week": "Week",
22682274
"welcome": "Welcome",

mise.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ experimental_monorepo_root = true
33
[tools]
44
node = "24.11.1"
55
flutter = "3.35.7"
6-
pnpm = "10.22.0"
6+
pnpm = "10.24.0"
77
terragrunt = "0.93.10"
88
opentofu = "1.10.7"
99
java = "25.0.1"

mobile/android/app/src/main/kotlin/app/alextran/immich/sync/Messages.g.kt

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,10 @@ data class PlatformAsset (
8989
val height: Long? = null,
9090
val durationInSeconds: Long,
9191
val orientation: Long,
92-
val isFavorite: Boolean
92+
val isFavorite: Boolean,
93+
val adjustmentTime: Long? = null,
94+
val latitude: Double? = null,
95+
val longitude: Double? = null
9396
)
9497
{
9598
companion object {
@@ -104,7 +107,10 @@ data class PlatformAsset (
104107
val durationInSeconds = pigeonVar_list[7] as Long
105108
val orientation = pigeonVar_list[8] as Long
106109
val isFavorite = pigeonVar_list[9] as Boolean
107-
return PlatformAsset(id, name, type, createdAt, updatedAt, width, height, durationInSeconds, orientation, isFavorite)
110+
val adjustmentTime = pigeonVar_list[10] as Long?
111+
val latitude = pigeonVar_list[11] as Double?
112+
val longitude = pigeonVar_list[12] as Double?
113+
return PlatformAsset(id, name, type, createdAt, updatedAt, width, height, durationInSeconds, orientation, isFavorite, adjustmentTime, latitude, longitude)
108114
}
109115
}
110116
fun toList(): List<Any?> {
@@ -119,6 +125,9 @@ data class PlatformAsset (
119125
durationInSeconds,
120126
orientation,
121127
isFavorite,
128+
adjustmentTime,
129+
latitude,
130+
longitude,
122131
)
123132
}
124133
override fun equals(other: Any?): Boolean {

mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
44
import android.content.ContentUris
55
import android.content.Context
66
import android.database.Cursor
7-
import android.net.Uri
87
import android.os.Bundle
98
import android.provider.MediaStore
109
import android.util.Base64

mobile/drift_schemas/main/drift_schema_v14.json

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)