Merge branch 'master' into fix-invalid-layer-vr

MerginMaps · Jul 19, 2024 · 68b0cb2 · 68b0cb2 · inputapp-bot · Jul 19, 2024
2 parents dd05acc + 9f3ac1b
commit 68b0cb2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.zenodo.json b/.zenodo.json
@@ -2,7 +2,7 @@
     "description": "<p>Mergin Maps mobile app is a QGIS powered app for Android and iOS devices.</p>", 
     "license": "GPLv3", 
     "title": "Mergin Maps mobile app", 
-    "version": "2024.3.0",
+    "version": "2024.3.1",
     "upload_type": "software", 
     "publication_date": "2022-02-24", 
     "creators": [
@@ -39,7 +39,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/MerginMaps/mobile/tree/2024.3.0", 
+            "identifier": "https://github.com/MerginMaps/mobile/tree/2024.3.1", 
             "relation": "isSupplementTo"
         }, 
         {

diff --git a/CITATION.cff b/CITATION.cff
@@ -1,4 +1,4 @@
-cff-version: 2024.3.0
+cff-version: 2024.3.1
 message: "If you use this software, please cite it as below."
 authors:
 - family-names: "Martin"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.22)
 # TODO automatically change with the scripts/update version script
 set(MM_VERSION_MAJOR "2024")
 set(MM_VERSION_MINOR "3")
-set(MM_VERSION_PATCH "0")
+set(MM_VERSION_PATCH "1")
 set(QT_VERSION_DEFAULT "6.6.3")
 
 # Note: we cannot set this for non-android build, since CMake will start looking for

diff --git a/app/qml/project/components/MMProjectDelegate.qml b/app/qml/project/components/MMProjectDelegate.qml
@@ -101,6 +101,8 @@ Control {
               if ( root.state === "Error" ) return __style.darkGreyColor
               return __style.nightColor
             }
+
+            elide: Text.ElideLeft
           }
 
           Row {
-Original file line number
+Diff line change
@@ Expand Up / @@ -101,6 +101,8 @@ Control { @@
                   if ( root.state === "Error" ) return __style.darkGreyColor
                   return __style.nightColor
                 }
+                elide: Text.ElideLeft
               }
               Row {
@@ Expand Down @@