Backport master to develop

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

README.md

@@ -14,6 +14,10 @@
   <a href="https://coveralls.io/github/MerginMaps/mergin"><img src="https://coveralls.io/repos/github/MerginMaps/mergin/badge.svg"></a>
 </p>
 
+> [!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
-<br><br>
 
-<div><img align="left" width="45" height="45" src="https://raw.githubusercontent.com/MerginMaps/docs/main/src/public/slack.svg"><a href="https://merginmaps.com/community/join">Join our community chat</a><br/>and ask questions!</div>
-<br>
+<a href="https://community.merginmaps.com">Join our community</a> and ask questions!
 
 ## Developers
 

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,
     )

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

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

web-app/packages/lib/src/env.d.ts

@@ -5,7 +5,7 @@
 /// <reference types="vite/client" />
 
 interface ImportMetaEnv {
-  readonly VITE_VUE_APP_JOIN_COMMUNITY_LINK: string
+  readonly VITE_VUE_APP_COMMUNITY_LINK: string
 }
 
 interface ImportMeta {

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 ?? [])