Skip to content

Commit dcb1ee1

Browse files
committed
Merge branch 'master' into fix-photo-widget-validation
2 parents e060638 + ce40f1d commit dcb1ee1

3 files changed

Lines changed: 27 additions & 3 deletions

File tree

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Notify releases repo
2+
3+
on:
4+
milestone:
5+
types: [created, edited]
6+
7+
jobs:
8+
notify:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Dispatch to releases repo
12+
env:
13+
GH_TOKEN: ${{ secrets.MM_RELEASES_SYNC_TOKEN }}
14+
run: |
15+
gh api repos/MerginMaps/releases/dispatches \
16+
--method POST \
17+
-f event_type=milestone-${{ github.event.action }} \
18+
-f 'client_payload[repo]=${{ github.repository }}' \
19+
-f 'client_payload[milestone_title]=${{ github.event.milestone.title }}' \
20+
-f 'client_payload[milestone_url]=${{ github.event.milestone.html_url }}'

.github/workflows/packages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
default: '2.2.0'
1414
type: string
1515
env:
16-
PYTHON_API_CLIENT_VER: ${{ inputs.REQUESTED_PYTHON_API_CLIENT_VER || '0.12.2' }}
16+
PYTHON_API_CLIENT_VER: ${{ inputs.REQUESTED_PYTHON_API_CLIENT_VER || '0.12.3' }}
1717
GEODIFF_VER: ${{ inputs.REQUESTED_GEODIFF_VER || '2.2.0' }}
1818
PYTHON_VER: "38"
1919
jobs:

Mergin/metadata.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,18 @@ name=Mergin
44
qgisMinimumVersion=3.22
55
qgisMaximumVersion=4.99
66
description=Handle Mergin Maps projects
7-
version=2026.1.2
7+
version=2026.2.0
88
author=Lutra Consulting
99
email=info@merginmaps.com
1010
about=Mergin Maps is a repository for storing and tracking changes to QGIS projects/data and has its mobile app for field geo-surveys. With this plugin, users can upload and sync their data to Mergin Maps service.
1111
; end of mandatory metadata
1212

1313
; start of optional metadata
14-
changelog=2026.1.2
14+
changelog=2026.2.0
15+
- Export and import of QGIS authorization configurations for external layers
16+
- Fix issues when upgrading the plugin on Windows
17+
- Fix directory validation for project creation
18+
<p>2026.1.2
1519
- Fix for inability to sync removed geopackages
1620
<p>2026.1.1
1721
- Fix support for macbooks with M chips (arm64)

0 commit comments

Comments
 (0)