Merged master into release

docker-app/qfieldcloud/core/admin.py

@@ -568,6 +568,22 @@ class ProjectFilesWidget(widgets.Input):
     template_name = "admin/project_files_widget.html"
 
 
+class OwnerTypeFilter(admin.SimpleListFilter):
+    title = _("owner type")
+    parameter_name = "owner_type"
+
+    def lookups(self, request, model_admin):
+        return [(User.Type.PERSON, "Person"), (User.Type.ORGANIZATION, "Organization")]
+
+    def queryset(self, request, queryset):
+        value = self.value()
+
+        if value is None:
+            return queryset
+
+        return queryset.filter(owner__type=value)
+
+
 class ProjectForm(ModelForm):
     project_files = fields.CharField(
         disabled=True, required=False, widget=ProjectFilesWidget
@@ -594,6 +610,7 @@ class ProjectAdmin(QFieldCloudModelAdmin):
         "is_public",
         "created_at",
         "updated_at",
+        OwnerTypeFilter,
     )
     fields = (
         "id",

docker-app/requirements.txt

@@ -10,7 +10,7 @@ cffi==1.15.1
 charset-normalizer==2.0.9
 coreapi==2.3.3
 coreschema==0.0.4
-cryptography==41.0.6
+cryptography==42.0.0
 defusedxml==0.7.1
 Deprecated==1.2.13
 Django==3.2.23

docker-app/worker_wrapper/wrapper.py

@@ -307,7 +307,7 @@ def _run_docker(
                 "QT_QPA_PLATFORM": "offscreen",
             },
             volumes=volumes,
-            # TODO keep the logs somewhere or even better -> pipe them to redis and store them there
+            # TODO stream the logs to something like redis, so they can be streamed back in project jobs page to the user live
             # auto_remove=True,
             network=settings.QFIELDCLOUD_DEFAULT_NETWORK,
             detach=True,

docker-qgis/requirements_libqfieldsync.txt

@@ -1 +1 @@
-libqfieldsync @ git+https://github.com/opengisch/libqfieldsync@8ee725ca401b5d083edd8feed733803b8709d496
+libqfieldsync @ git+https://github.com/opengisch/libqfieldsync@e3647e9b0fcbaf74cbb4c3f72bc8f34d99cb44e0