diff --git a/LICENSES/CLA-signed-list.md b/LICENSES/CLA-signed-list.md index 1f4c1cc9..0b78a52f 100644 --- a/LICENSES/CLA-signed-list.md +++ b/LICENSES/CLA-signed-list.md @@ -23,3 +23,4 @@ C/ My company has custom contribution contract with Lutra Consulting Ltd. or I a * fernandinand, 13th March 2025 * wonder-sk, 9th February 2026 * xkello, 26th January 2026 +* gabriel-bolbotina, 18th August 2026 diff --git a/README.md b/README.md index d1dcbbe0..49f01d25 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,10 @@

+> [!WARNING] +> **Why are there no releases this year?** +> Releases are intentionally paused while we transition to new sync API. New versions will be available early October. Read more here: https://community.merginmaps.com/p/the-state-of-self-hosted-server-releases-august-2026 + ## About Mergin Maps is a web platform for storage and synchronisation of geospatial projects across multiple users and devices (desktop and mobile). @@ -84,10 +88,8 @@ If you'd like to contribute and improve the documentation, visit https://github. ## Get in touch If you need support, a custom deployment, extending the service capabilities and new features do not hesitate to contact us on info@lutraconsulting.co.uk -

-
Join our community chat
and ask questions!
-
+Join our community and ask questions! ## Developers diff --git a/server/mergin/celery.py b/server/mergin/celery.py index 1ed09246..9c7a2b39 100644 --- a/server/mergin/celery.py +++ b/server/mergin/celery.py @@ -11,7 +11,6 @@ from .config import Configuration from .app import mail - # create on flask app independent object # we need this for defining tasks, and celery is then configured in run_celery.py celery = Celery( @@ -68,6 +67,7 @@ def __call__(self, *args, **kwargs): celery.conf.update(app.config) celery.conf.update( task_acks_late=Configuration.CELERY_ACKS_LATE, + task_send_sent_event=Configuration.CELERY_SEND_TASK_SENT_EVENT, worker_concurrency=Configuration.CELERYD_CONCURRENCY, worker_prefetch_multiplier=Configuration.CELERYD_PREFETCH_MULTIPLIER, ) diff --git a/server/mergin/config.py b/server/mergin/config.py index 15773799..f2041410 100644 --- a/server/mergin/config.py +++ b/server/mergin/config.py @@ -69,6 +69,11 @@ class Configuration(object): "CELERY_RESULT_BACKEND_TRANSPORT_OPTIONS", default="{}", cast=eval ) CELERY_ACKS_LATE = config("CELERY_ACKS_LATE", default=False, cast=bool) + # send a task-sent event when a task is published so that monitoring tools + # (e.g. celery-exporter) can report the queue name, including for failed tasks + CELERY_SEND_TASK_SENT_EVENT = config( + "CELERY_SEND_TASK_SENT_EVENT", default=False, cast=bool + ) CELERYD_CONCURRENCY = config("CELERYD_CONCURRENCY", default=1, cast=int) CELERYD_PREFETCH_MULTIPLIER = config( "CELERYD_PREFETCH_MULTIPLIER", default=4, cast=int diff --git a/web-app/packages/lib/.env b/web-app/packages/lib/.env index 0d2a175b..f978b2e9 100644 --- a/web-app/packages/lib/.env +++ b/web-app/packages/lib/.env @@ -1 +1 @@ -VITE_VUE_APP_JOIN_COMMUNITY_LINK=https://merginmaps.com/community/join +VITE_VUE_APP_COMMUNITY_LINK=https://community.merginmaps.com diff --git a/web-app/packages/lib/src/env.d.ts b/web-app/packages/lib/src/env.d.ts index 89cc8af8..1aad9f22 100644 --- a/web-app/packages/lib/src/env.d.ts +++ b/web-app/packages/lib/src/env.d.ts @@ -5,7 +5,7 @@ /// interface ImportMetaEnv { - readonly VITE_VUE_APP_JOIN_COMMUNITY_LINK: string + readonly VITE_VUE_APP_COMMUNITY_LINK: string } interface ImportMeta { diff --git a/web-app/packages/lib/src/modules/layout/components/AppHeaderTemplate.vue b/web-app/packages/lib/src/modules/layout/components/AppHeaderTemplate.vue index 5469686d..9765b9f4 100644 --- a/web-app/packages/lib/src/modules/layout/components/AppHeaderTemplate.vue +++ b/web-app/packages/lib/src/modules/layout/components/AppHeaderTemplate.vue @@ -242,8 +242,8 @@ export default defineComponent({ target: '_blank' }, { - label: 'Community chat', - url: import.meta.env.VITE_VUE_APP_JOIN_COMMUNITY_LINK, + label: 'Community', + url: import.meta.env.VITE_VUE_APP_COMMUNITY_LINK, target: '_blank' }, ...(this.helpMenuItems ?? [])