1c8e3992d6
Merge pull request 'master' ( #438 ) from master into Docker
...
Reviewed-on: #438
2024-08-26 18:57:35 +02:00
669a12410f
Merge pull request 'missing_migrations' ( #437 ) from missing_migrations into master
...
Reviewed-on: #437
2024-08-26 18:57:10 +02:00
dd77e6c16e
Merge branch 'refs/heads/master' into missing_migrations
2024-08-26 18:53:11 +02:00
33774ce557
# Migrations
...
* adds missing migrations
* renames variables shadowing in-builts
2024-08-26 18:51:58 +02:00
e6e9e141c8
Merge pull request 'master' ( #436 ) from master into Docker
...
Reviewed-on: #436
2024-08-19 18:35:17 +02:00
dc3dc99b3d
Merge pull request '# User filtering' ( #435 ) from 433_Filter_by_user into master
...
Reviewed-on: #435
2024-08-19 11:42:18 +02:00
315f9de958
# User filtering
...
* adds query filter to search for logged users on entries
2024-08-19 11:38:09 +02:00
0726c15086
Merge pull request '432_Unreadable_payments' ( #434 ) from 432_Unreadable_payments into master
...
Reviewed-on: #434
2024-08-19 10:26:40 +02:00
2492a8abe8
# Codelist migration optimization
...
* adds boolean to de-/activate migration logic inside of 0002_migrate_975_to_288.py
2024-08-19 10:23:05 +02:00
dbc5cba5d7
# Variable refactoring
...
* renames variable `has_access` into `is_entry_shared` for better understanding in various places (mostly html related)
2024-08-19 09:44:45 +02:00
c8948ddaea
# Censor payments
...
* censor payments if entry is not shared with user
* updates translations
2024-08-19 09:39:58 +02:00
f8ece06ee8
Merge pull request 'master' ( #431 ) from master into Docker
...
Reviewed-on: #431
2024-08-07 12:07:22 +02:00
5039da28aa
Merge pull request '# Hotfix' ( #430 ) from 427_Integration_of_codelist_288 into master
...
Reviewed-on: #430
2024-08-07 12:07:04 +02:00
4567339570
# Hotfix
...
* fixes requirements dependency
2024-08-07 12:06:27 +02:00
149a351bfd
Merge pull request 'master' ( #429 ) from master into Docker
...
Reviewed-on: #429
2024-08-07 12:02:21 +02:00
768849e646
Merge pull request '427_Integration_of_codelist_288' ( #428 ) from 427_Integration_of_codelist_288 into master
...
Reviewed-on: #428
2024-08-07 12:01:46 +02:00
ebf10645fc
# Requirements update
...
* updates some packages in requirements.txt
2024-08-07 09:17:20 +02:00
df241747cf
# Migration list 975->288
...
* adds migration for app codelist to migrate existing biotope type details codes from list 975 to 288 depending on their atomID
* improves rendering of action and biotope type details on frontend for KOM, OEK and EMA
* refactors KonovaCode str() rendering
2024-08-07 09:12:38 +02:00
94e9035e10
# Codelist 288
...
* introduces 288 to codelist/settings.py
* refactors usage from 975 to 288
* enhances rendering of codelist names depending on which name exists (short vs long)
2024-08-06 15:39:01 +02:00
0164717b8e
Merge pull request 'master' ( #426 ) from master into Docker
...
Reviewed-on: #426
2024-08-06 14:28:41 +02:00
d4d39689cc
Merge pull request '# Bugfix' ( #425 ) from 424_Archived_codes_selectable into master
...
Reviewed-on: #425
2024-08-06 14:28:16 +02:00
2fde3f0fa3
# Bugfix
...
* fixes bug where archived codes has been selectable due to recursive building of child-parent hierarchy
2024-08-06 14:27:38 +02:00
104952bfc3
Merge pull request 'master' ( #423 ) from master into Docker
...
Reviewed-on: #423
2024-07-10 09:30:30 +02:00
b62c2e92c9
Merge pull request '# Dependency fix' ( #422 ) from 419_Dependency_upgrade into master
...
Reviewed-on: #422
2024-07-10 09:30:14 +02:00
1c0fb801e6
# Dependency fix
...
* fixes dependency mismatch between requests 2.32.3 and kombu (requires < 2.32.0)
2024-07-10 09:29:54 +02:00
f96241c8d1
Merge pull request 'master' ( #421 ) from master into Docker
...
Reviewed-on: #421
2024-07-10 09:27:09 +02:00
a1acff5e90
Merge pull request '# Dependency update' ( #420 ) from 419_Dependency_upgrade into master
...
Reviewed-on: #420
2024-07-10 09:26:35 +02:00
25a92f59aa
# Dependency update
...
* updates dependencies due to important version changes
2024-07-10 09:26:18 +02:00
ac6b534f58
Merge pull request 'master' ( #418 ) from master into Docker
...
Reviewed-on: #418
2024-07-08 18:44:22 +02:00
884db6f014
Merge pull request '# Readonly map' ( #417 ) from map_client_update_08-07-2024 into master
...
Reviewed-on: #417
2024-07-08 18:44:00 +02:00
59b7f3c69a
# Readonly map
...
* fixes bug where readonly mode of map client was not readonly at all
2024-07-08 06:59:15 +02:00
06910cd69a
# Image tag
...
* increases image tag
2024-07-05 10:56:10 +02:00
a48ba520fc
Merge branch 'refs/heads/master' into Docker
...
# Conflicts:
# konova/celery.py
2024-07-05 10:52:13 +02:00
0446d50438
Merge pull request '# .env fix' ( #415 ) from env_fix into master
...
Reviewed-on: #415
2024-07-05 10:51:25 +02:00
12f78c85bf
# .env fix
...
* adds celery setting to .env.sample
2024-07-05 10:50:25 +02:00
9f18aa5890
Merge pull request 'master' ( #414 ) from master into Docker
...
Reviewed-on: #414
2024-07-04 11:42:20 +02:00
78485a4506
Merge pull request '# Requirements update' ( #413 ) from fix_sso into master
...
Reviewed-on: #413
2024-07-04 11:42:05 +02:00
21a5c84b18
# Requirements update
...
* due to existing migrations, django-simple-sso needs to be added as a dependency as well as itsdangerous (dependency of django-simple-sso)
* however, there is no active usage of any of these packages anymore
2024-07-04 11:39:17 +02:00
ab3bd84f3b
# Docker enhancement
...
* adds logging for gunicorn by default
* adds image tagging
* drops docker-compose environment setting in favor of .env usage (needs to be copied from .env.sample)
2024-07-04 09:37:13 +02:00
f829cd5a4c
Merge branch 'refs/heads/master' into Docker
...
# Conflicts:
# konova/sub_settings/django_settings.py
# konova/sub_settings/sso_settings.py
# requirements.txt
2024-07-04 09:30:41 +02:00
a93f509d51
Merge pull request 'env' ( #411 ) from env into master
...
Reviewed-on: #411
2024-07-04 08:36:04 +02:00
38967da201
Merge pull request '407_Drop_django-simple-sso' ( #410 ) from 407_Drop_django-simple-sso into master
...
Reviewed-on: #410
2024-07-04 07:58:15 +02:00
60d749db2d
# Geopackage import configuration
...
* corrects config for geopackage import support
2024-07-04 07:44:08 +02:00
0f2bf95b71
Merge pull request 'master' ( #409 ) from master into Docker
...
Reviewed-on: #409
2024-06-18 11:50:43 +02:00
dff577309e
Merge pull request '# Send-to-EGON cmd' ( #408 ) from sending_to_egon_cmd into master
...
Reviewed-on: #408
2024-06-18 11:49:35 +02:00
ea590d0868
# Send-to-EGON cmd
...
* adds new custom command send_to_egon for performing EGON sending on a list of intervention ids
2024-06-18 11:48:56 +02:00
e09c15bd51
# Updates sso
...
* adds env usage for sso settings
2024-06-14 13:04:25 +02:00
c3019f83fd
Merge branch 'refs/heads/407_Drop_django-simple-sso' into env
...
# Conflicts:
# konova/sub_settings/sso_settings.py
# requirements.txt
2024-06-14 13:02:33 +02:00
93a71a7055
# Requirements update
...
* updates requirements.txt
* drops django-simple-sso from codebase and requirements.txt
2024-06-14 13:00:09 +02:00
35b1409359
# Requirements update
...
* updates requirements.txt
* drops debug-toolbar
2024-06-14 07:42:17 +02:00
