Merge remote-tracking branch 'origin/main' into 2025.4.0-envs

Author: MarcelGeo

.github/workflows/checks.yml

@@ -1,6 +1,9 @@
 name: Checks
 # Triggered when code is pushed to any branch in a repository
-on: push
+on: 
+  push:
+    branches:
+      - '**'
 
 jobs:
   spellcheck:
@@ -56,6 +59,13 @@ jobs:
       run: |
         EXCLUDE_LIST=$(cat scripts/broken-link-exceptions.txt)
         echo "EXCLUDE_LIST=$EXCLUDE_LIST" >> $GITHUB_ENV
+
+    - name: Do not check Github links on dev branches
+      if: ${{ github.ref_name != 'main' }}
+      run: |
+        # Do not check GH on every commit, their rate limits are too small
+        EXCLUDE_LIST="$EXCLUDE_LIST --exclude=https://github.com/*"
+        echo "EXCLUDE_LIST=$EXCLUDE_LIST" >> $GITHUB_ENV
      
     - name: Check broken links
       uses: ruzickap/action-my-broken-link-checker@v2

.github/workflows/status-dev.yml

@@ -1,15 +1,12 @@
 name: Status PROD
 
-# runs at minute 0 of the 2rd,5th,8th and 11th hour
+# runs 6:00 AM every day
 on:
-  push:
-    branches:
-      - main
   schedule:
-    - cron:  '0 2,5,8,11 * * *'
+    - cron:  '0 6 * * *'
 
 jobs:
-  dev_status_check:
+  status_check:
     runs-on: ubuntu-latest
     env:
       URL: "https://merginmaps.com/docs"
@@ -29,4 +26,4 @@ jobs:
         uses: ruzickap/action-my-broken-link-checker@v2
         with:
           url: ${{ env.URL }}
-          cmd_params: --buffer-size=8192 --max-connections=10 --color=always --skip-tls-verification --ignore-fragments --timeout=60 ${{ env.EXCLUDE_LIST }}
+          cmd_params: --buffer-size=8192 --max-connections=10 --rate-limit=1 --color=always --skip-tls-verification --ignore-fragments --timeout=60 ${{ env.EXCLUDE_LIST }}

.github/workflows/status-prod.yml

@@ -1,8 +1,7 @@
-[![Checks](https://github.com/MerginMaps/docs/actions/workflows/checks.yml/badge.svg)](https://github.com/MerginMaps/docs/actions/workflows/checks.yml)
-[![Deploy DEV](https://github.com/MerginMaps/docs/actions/workflows/dist-dev.yml/badge.svg)](https://github.com/MerginMaps/docs/actions/workflows/dist-dev.yml)
-[![Status DEV](https://github.com/MerginMaps/docs/actions/workflows/status-dev.yml/badge.svg)](https://github.com/MerginMaps/docs/actions/workflows/status-dev.yml)
 [![Deploy PROD](https://github.com/MerginMaps/docs/actions/workflows/dist-prod.yml/badge.svg)](https://github.com/MerginMaps/docs/actions/workflows/dist-prod.yml)
 [![Status PROD](https://github.com/MerginMaps/docs/actions/workflows/status-prod.yml/badge.svg)](https://github.com/MerginMaps/docs/actions/workflows/status-prod.yml)
+[![Deploy DEV](https://github.com/MerginMaps/docs/actions/workflows/dist-dev.yml/badge.svg)](https://github.com/MerginMaps/docs/actions/workflows/dist-dev.yml)
+[![Checks](https://github.com/MerginMaps/docs/actions/workflows/checks.yml/badge.svg)](https://github.com/MerginMaps/docs/actions/workflows/checks.yml)
 
 # Mergin Maps Documentation
 

README.md

@@ -135,6 +135,7 @@ SLA
 SMTP
 SQLAlchemy
 SSH
+SSO
 SVG
 SVGs
 SaaS
@@ -291,3 +292,15 @@ workspaces
 www
 zlib
 zoomstack
+Entra
+Auth
+SAML
+OIDC
+SSO
+Ory
+Polis
+SAML
+yaml
+pre
+env
+IDP

scripts/wordlist.txt

@@ -0,0 +1,3 @@
+<template>
+  <span class="nospellcheck">Mergin Maps dashboard</span>
+</template>

src/.vitepress/components/DashboardName.vue

@@ -0,0 +1,3 @@
+<template>
+  <span class="nospellcheck">dashboard</span>
+</template>

src/.vitepress/components/DashboardNameShort.vue

@@ -0,0 +1,3 @@
+<template>
+  <span class="nospellcheck">Mergin Maps Cloud</span>
+</template>

src/.vitepress/components/ServerCloudName.vue

@@ -55,6 +55,7 @@ export default {
         { text: 'How to Set Photo Names Format', link: '/gis/photo-names/' },
         { text: 'How to Enable Digitising', link: '/gis/enable_digitising/' },
         { text: 'How to Set Up Snapping for Mergin Maps Mobile App', link: '/gis/snapping/' },
+        { text: 'How to Avoid Polygons Overlap', link: '/gis/avoid-overlap/' },
         { text: 'Custom Projections', link: '/gis/proj/' },
         { text: 'Supported Formats', link: '/gis/supported_formats/' }
       ]
@@ -100,7 +101,8 @@ export default {
       collapsed: true,
       items: [
         { text: 'Custom Mobile App', link: '/dev/customapp/' },
-        { text: 'Integrate Mergin Maps', link: '/dev/integration/' },
+        { text: 'Python API Client', link: '/dev/integration/' },
+        { text: 'C++ API Client', link: '/dev/integration-cpp/' },
         { text: 'PostgreSQL DB Sync', link: '/dev/dbsync/' },
         { text: 'Media Sync', link: '/dev/media-sync/' },
         { text: 'Work Packages', link: '/dev/work-packages/' },
@@ -113,6 +115,7 @@ export default {
       items: [
         { text: 'Overview', link: '/server/' },
         { text: 'Install', link: '/server/install/' },
+        { text: 'Single Sign-On Deployment', link: '/server/sso-deployment/' },
         { text: 'Secure Mergin Maps Installation', link: '/server/security/' },
         { text: 'Upgrade', link: '/server/upgrade/' },
         { text: 'Administer', link: '/server/administer/' },

src/.vitepress/sidebar/en.js

@@ -0,0 +1,30 @@
+# C++ API Client
+[[toc]]
+
+Do you want to integrate <MainPlatformNameLink />? <MainPlatformName /> is an open platform that aims to be developer friendly and it has been designed to allow easy integration with other software.
+
+## Installation
+C++ API client is completely without any dependencies. To install the client, just download the binary for your platform from <GitHubRepo id="MerginMaps/cpp-api-client/releases"/> and use it from the command line.
+
+The client uses Qt-based <GitHubRepo id="MerginMaps/mobile/tree/master/core" desc="Mergin Maps API core library" /> used by the <MainDomainNameLink desc="mobile app" /> to sync the projects in the mobile application. Go to <GitHubRepo id="MerginMaps/cpp-api-client" /> repository for more information on how to use it. 
+
+## Command line interface
+When the client is installed, it comes with `mergin` command line tool.
+
+```bash 
+$ mergin --help
+Usage: mergin [OPTIONS] COMMAND [ARGS]...
+
+Options:  
+  --help      Show this message and exit.
+  --version   Show the version information.
+  --username  Mergin username (or MERGIN_USERNAME env. variable)
+  --password  Mergin password (or MERGIN_PASSWORD env. variable)
+  --url       Mergin url      (defaults to app.merginmaps.com)
+
+Commands:
+  create         Create a new project on Mergin server
+  download       Download last version of mergin project
+  sync           Pull&Push the changes
+  remove         Remove project from server.
+```