master #123

2022-02-18T15:21:20+01:00

mpeltriaux commented

2022-02-18 15:21:20 +01:00

Updates Docker

mpeltriaux added 33 commits 2022-02-18 15:21:20 +01:00

# 110 Biotope codelists e7454e558d

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

#112 WIP: Restructure CompensationAction 2b66189590

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

#112 Migration enhance afb78fa670

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

WIP: CompensationAction using jstree 62e452c625

WIP: #112 Restructure CompensationAction d04d02380f

#112 CompensationAction Tree 95856c9ee9

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

#112 AbstractCompensation rendering enhancements c0de1ae28d

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

#112 CompensationAction explanation 4be26fbc22

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

#112 TreeWidget JS 6d5e2b8d15

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

# 112 Search input for TreeWidget 1ea5b4fc39

* adds search input field for js-filtering by input

#112 Autocomplete enhancements a160f3fe6c

* 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

#112 Order enhancement ed27d8d589

* enhances ordering for action details and biotope details

#112 Tree filter case insensitive search 91185ef847

* adds case insensitive search for TreeWidget

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

Reviewed-on: SGD-Nord/konova#115

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

Reviewed-on: SGD-Nord/konova#116

# 110 Biotope codes 8224f4c8c5

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

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

Reviewed-on: SGD-Nord/konova#117

#118 API ActionTypes 0677cec709

* adds support for multiple action_type entries on one CompensationAction

#118 API pagination c7382f1e54

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

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

Reviewed-on: SGD-Nord/konova#119

#114 Unshared Account Deductions 5ccb63d27b

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

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

Reviewed-on: SGD-Nord/konova#120

#101 Team settings 75c70ff8dc

* adds first implementation for team managing

#101 Team enhancements 9fec85b688

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

WIP: #101 Team sharing form 3878b5dbdb

* adds form for sharing via team

Missing migration 31f4369236

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

Merge branch 'master' into 101_Team_based_sharing 071bdea099

#101 Team sharing form e152dfd4d7

* 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

#101 Team sharing tests edcf7b3c78

* 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

#101 Team data view 87a93b9a7f

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

#101 Datatype team migrations 50def040f2

* adds migration files for ShareableObject data models

#101 Team mails 963854652e

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

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

Reviewed-on: SGD-Nord/konova#122

mpeltriaux merged commit fdfb724109 into Docker

2022-02-18 15:21:30 +01:00

mpeltriaux referenced this issue from a commit

2022-02-18 15:21:30 +01:00

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

btuelek referenced this issue from a commit

2024-12-05 13:18:37 +01:00

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

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: IT-Naturschutz/konova#123