master #236

Merged

mpeltriaux merged 3 commits from master into Docker

mpeltriaux commented

Owner

Update Docker

mpeltriaux added 3 commits

0cefc0e0b8 Fix CompensationAction unit None

* adds correct declaration of unit (qm -> m2) for template rendering
* adds migration to transform existing qm units to m2

a157891f9d Z-axis geometry upload fix

* adds clamping of 3D geometries to 2D geometries if uploaded using the map importer
* extends tests for payment-document linkage
* fixes bug in team-admin selection where autocomplete could not be resolved properly

0f08071ca6 Merge pull request 'fix_comp_action_units' (#235 ) from fix_comp_action_units into master

Reviewed-on: SGD-Nord/konova#235

mpeltriaux merged commit 6a53de8cc4 into Docker 2 years ago

mpeltriaux referenced this issue from a commit

Merge pull request 'master' (#236) from master into Docker

The pull request has been merged as 6a53de8cc4.

You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.

git checkout -b master Docker

git pull origin master

Step 2:

Merge the changes and update on Gitea.

git checkout Docker

git merge --no-ff master

git push origin Docker

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Loading…

There is no content yet.

Labels Milestones

master #236

Step 1:

Step 2: