master #123

Merged

mpeltriaux merged 33 commits from master into Docker

mpeltriaux commented

Owner

Updates Docker

mpeltriaux added 33 commits

e7454e558d # 110 Biotope codelists

* adds codelist 654 to settings
* adds codelist to update_codelist command

2b66189590 #112 WIP: Restructure CompensationAction

* changes action_type from ForeignKey into M2M
* adds migration
* changes form widget
* WIP: changes rendering on detail view of compensation
* TEST NOT CHECKED YET!

afb78fa670 #112 Migration enhance

* fixes bug in migration
* adds check to migration which raises error before data loss might happen

62e452c625 WIP: CompensationAction using jstree

d04d02380f WIP: #112 Restructure CompensationAction

95856c9ee9 #112 CompensationAction Tree

* implements generic HTML based and Django compatible TreeView
* enhances listing of CompensationActions on DetailView

c0de1ae28d #112 AbstractCompensation rendering enhancements

* minor changes to detail view rendering of EMA, Compensation and EcoAccount

4be26fbc22 #112 CompensationAction explanation

* updates the help_text for action_type on NewActionModalForm to give a better explanation

6d5e2b8d15 #112 TreeWidget JS

* adds visual support on (de-)selecting checkboxes
* adds same support on initialization of checked checkboxes e.g. on edit forms

1ea5b4fc39 # 112 Search input for TreeWidget

* adds search input field for js-filtering by input

a160f3fe6c #112 Autocomplete enhancements

* enhances filtering for Autocomplete -> parent_parent will be searched for match as well
* adds rendering of parent_parent group for BiotopeAutocomplete
* enhances ordering of registration office autocomplete

ed27d8d589 #112 Order enhancement

* enhances ordering for action details and biotope details

91185ef847 #112 Tree filter case insensitive search

* adds case insensitive search for TreeWidget

b528c8ecce Merge pull request '112_Restructure_CompensationAction' (#115 ) from 112_Restructure_CompensationAction into master

Reviewed-on: SGD-Nord/konova#115

aaea58217b Merge pull request 'master' (#116 ) from master into 110_Biotope_codelists

Reviewed-on: SGD-Nord/konova#116

8224f4c8c5 # 110 Biotope codes

* removes list 974 from update_codelist.py command
* adds migration for existing biotope states to be changed into proper list

3c9eed894a Merge pull request '110_Biotope_codelists' (#117 ) from 110_Biotope_codelists into master

Reviewed-on: SGD-Nord/konova#117

0677cec709 #118 API ActionTypes

* adds support for multiple action_type entries on one CompensationAction

c7382f1e54 #118 API pagination

* adds pagination and related parameters to GET apis
* updates api GET test

85f777f683 Merge pull request '118_API_update' (#119 ) from 118_API_update into master

Reviewed-on: SGD-Nord/konova#119

5ccb63d27b #114 Unshared Account Deductions

* enables deducting from unshared eco accounts
   * account must be recorded and not deleted, so users can use it for deductions

2339fcebd1 Merge pull request '#114 Unshared Account Deductions' (#120 ) from 114_Deduct_from_unshared_EcoAccount into master

Reviewed-on: SGD-Nord/konova#120

75c70ff8dc #101 Team settings

* adds first implementation for team managing

9fec85b688 #101 Team enhancements

* visual enhancement for team index rendering
* adds validity check for admin-membership of a team

3878b5dbdb WIP: #101 Team sharing form

* adds form for sharing via team

31f4369236 Missing migration

* adds a migration which has not been checked in from another branch

071bdea099 Merge branch 'master' into 101_Team_based_sharing

e152dfd4d7 #101 Team sharing form

* adds team sharing field to share form
* splits sharing logic into user based and teams based
* adds TeamAdmin for admin backend
* adds validity check on Team name -> only unused names shall be valid

edcf7b3c78 #101 Team sharing tests

* adds tests for team sharing
* extends the API for team sharing support
* adds shared_teams property shortcut for ShareableObjectMixin
* adds full support for team-based sharing to all views and functions
* simplifies ShareModalForm
* adds/updates translations

87a93b9a7f #101 Team data view

* adds overview of shared teams on object detail view
* adds team data view if button is clicked

50def040f2 #101 Datatype team migrations

* adds migration files for ShareableObject data models

963854652e #101 Team mails

* adds mail templates for shared data actions
* fixes bug where deleted compensations would be used for checking

87f1ca19fb Merge pull request '101_Team_based_sharing' (#122 ) from 101_Team_based_sharing into master

Reviewed-on: SGD-Nord/konova#122

mpeltriaux merged commit fdfb724109 into Docker 3 years ago

mpeltriaux referenced this issue from a commit

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

The pull request has been merged as fdfb724109.

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 #123

Step 1:

Step 2: