Commits

Branch selector

master

User selector

All users

All time

Commit history

Commits on May 20, 2026

• Merge pull request #301 from MerginMaps/bump_version0131

  Show description for 56a440d
  MarcelGeo

  authored
  56a440dView commit details

  Copy full SHA for 56a440d

  Browse repository at this point

• Bump 0.13.1

  MarcelGeo

  committed
  66781e4View commit details

  Copy full SHA for 66781e4

  Browse repository at this point

• Merge pull request #300 from MerginMaps/fix-unfinished-pull-subfolders

  Show description for 41a00e6
  MarcelGeo

  authored
  41a00e6View commit details

  Copy full SHA for 41a00e6

  Browse repository at this point

Commits on May 12, 2026

• Fix for unfinished pull in subfolders

  Show description for 4cc2407
  

  MarcelGeo

  and

  Copilot

  committed
  4cc2407View commit details

  Copy full SHA for 4cc2407

  Browse repository at this point

Commits on May 11, 2026

• Merge pull request #298 from MerginMaps/bump_0.13.0

  Show description for fd0381b
  MarcelGeo

  authored
  fd0381bView commit details

  Copy full SHA for fd0381b

  Browse repository at this point

• 0.13.0

  MarcelGeo

  committed
  5e941e5View commit details

  Copy full SHA for 5e941e5

  Browse repository at this point

• Merge pull request #296 from MerginMaps/v2-pull-integration

  Show description for 002e038
  MarcelGeo

  authored
  002e038View commit details

  Copy full SHA for 002e038

  Browse repository at this point

• Merge remote-tracking branch 'origin/master' into v2-pull-integration

  MarcelGeo

  committed
  7f4497dView commit details

  Copy full SHA for 7f4497d

  Browse repository at this point

Commits on May 4, 2026

• Merge pull request #297 from MerginMaps/project_info_version

  Show description for 548ec73
  MarcelGeo

  authored
  548ec73View commit details

  Copy full SHA for 548ec73

  Browse repository at this point

• Patch project info version before to be compatible with files_at_version parameter

  Show description for 422754e
  

  MarcelGeo

  and

  Copilot

  committed
  422754eView commit details

  Copy full SHA for 422754e

  Browse repository at this point

Commits on Apr 24, 2026

• bump version

  MarcelGeo

  committed
  52ce00fView commit details

  Copy full SHA for 52ce00f

  Browse repository at this point

Commits on Apr 21, 2026

• Merge pull request #295 from MerginMaps/copy_conflict_checksums

  Show description for 883e655
  MarcelGeo

  authored
  883e655View commit details

  Copy full SHA for 883e655

  Browse repository at this point

• Update typing

  MarcelGeo

  committed
  dda0e3bView commit details

  Copy full SHA for dda0e3b

  Browse repository at this point

Commits on Apr 20, 2026

• Handle None in local change

  MarcelGeo

  committed
  db29609View commit details

  Copy full SHA for db29609

  Browse repository at this point

• Adapt copy conflict changes

  MarcelGeo

  committed
  edbf0bdView commit details

  Copy full SHA for edbf0bd

  Browse repository at this point

Commits on Mar 11, 2026

• Merge pull request #294 from MerginMaps/pyapi_pipeline_checks

  Show description for e3d11d4
  MarcelGeo

  authored
  e3d11d4View commit details

  Copy full SHA for e3d11d4

  Browse repository at this point

Commits on Mar 6, 2026

• CI: temporarily disable flake8 checks

  DanChov

  committed
  948858aView commit details

  Copy full SHA for 948858a

  Browse repository at this point

• CI: removed ruff

  DanChov

  committed
  0be79faView commit details

  Copy full SHA for 0be79fa

  Browse repository at this point

• ci: security check for py-api client

  DanChov

  committed
  f98e22eView commit details

  Copy full SHA for f98e22e

  Browse repository at this point

Commits on Mar 5, 2026

• Merge pull request #282 from MerginMaps/pull-initial

  Show description for 3dd6637
  MarcelGeo

  authored
  3dd6637View commit details

  Copy full SHA for 3dd6637

  Browse repository at this point

• For server response with update:

  Show description for 37692a8
  MarcelGeo

  committed
  37692a8View commit details

  Copy full SHA for 37692a8

  Browse repository at this point

Commits on Mar 4, 2026

• use username instead of API_USER variable in test

  MarcelGeo

  committed
  ee87ad9View commit details

  Copy full SHA for ee87ad9

  Browse repository at this point

• Fix tests for new test_case

  MarcelGeo

  committed
  80c371cView commit details

  Copy full SHA for 80c371c

  Browse repository at this point

• Merge remote-tracking branch 'origin/v2-pull-integration' into pull-initial

  MarcelGeo

  committed
  9f89e3fView commit details

  Copy full SHA for 9f89e3f

  Browse repository at this point

• Merge remote-tracking branch 'origin/master' into v2-pull-integration

  MarcelGeo

  committed
  f326179View commit details

  Copy full SHA for f326179

  Browse repository at this point

Commits on Feb 27, 2026

• Fix renamed missing key

  MarcelGeo

  committed
  a41258aView commit details

  Copy full SHA for a41258a

  Browse repository at this point

• Fix rest of tests

  MarcelGeo

  committed
  e4afd04View commit details

  Copy full SHA for e4afd04

  Browse repository at this point

• Fix arguments of pull changes

  MarcelGeo

  committed
  f6aea66View commit details

  Copy full SHA for f6aea66

  Browse repository at this point

• Address comments @wonder-sk

  Show description for c3dd5ec
  MarcelGeo

  committed
  c3dd5ecView commit details

  Copy full SHA for c3dd5ec

  Browse repository at this point

• Apply suggestions from code review

  Show description for d1585fb
  

  MarcelGeo

  and

  Copilot

  authored
  d1585fbView commit details

  Copy full SHA for d1585fb

  Browse repository at this point

• Update mergin/merginproject.py

  Show description for 337757f
  

  MarcelGeo

  and

  Copilot

  authored
  337757fView commit details

  Copy full SHA for 337757f

  Browse repository at this point

• Update mergin/common.py

  Show description for be1ffed
  

  MarcelGeo

  and

  Copilot

  authored
  be1ffedView commit details

  Copy full SHA for be1ffed

  Browse repository at this point

• Update mergin/test/test_client_pull.py

  Show description for 3a1f47f
  

  MarcelGeo

  and

  Copilot

  authored
  3a1f47fView commit details

  Copy full SHA for 3a1f47f

  Browse repository at this point

• Merge pull request #293 from MerginMaps/qgis-security-scan

  Show description for bdbff66
  harminius

  authored
  bdbff66View commit details

  Copy full SHA for bdbff66

  Browse repository at this point

Commits on Feb 25, 2026

• reduce docstring entropy

  harminius

  committed
  d20d130View commit details

  Copy full SHA for d20d130

  Browse repository at this point