Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@jacquesfize
jacquesfize committed Jun 3, 2024
2 parents adf988a + 2ebdd0d commit 3149c0d
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: GEONATURE_BACKEND_IMAGE=ghcr.io/pnx-si/geonature-backend:2.14.1
build-args: GEONATURE_BACKEND_IMAGE=ghcr.io/pnx-si/geonature-backend:2.14.2

frontend:
name: Build geonature frontend docker image
Expand Down Expand Up @@ -92,4 +92,4 @@ jobs:
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: GEONATURE_FRONTEND_IMAGE=ghcr.io/pnx-si/geonature-frontend:2.14.1
build-args: GEONATURE_FRONTEND_IMAGE=ghcr.io/pnx-si/geonature-frontend:2.14.2
10 changes: 10 additions & 0 deletions docs/changelog.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# CHANGELOG

## 2.14.2 (2024-06-03)

- Geonature 2.14.2
- TaxHub 1.14.1
- UsersHub 2.4.3
- GeoNature-dashboard 1.5.0
- GeoNature-export 1.7.0
- GeoNature-import 2.3.0
- GeoNature-monitoring 0.7.3

## 2.14.1 (2024-05-03)

**🏷️ Versions**
Expand Down
2 changes: 1 addition & 1 deletion sources/GeoNature
Submodule GeoNature updated 39 files
+2 −3 .github/workflows/sphinx.yml
+1 −1 VERSION
+1 −1 backend/dependencies/Nomenclature-api-module
+1 −1 backend/dependencies/RefGeo
+1 −1 backend/dependencies/TaxHub
+1 −1 backend/dependencies/UsersHub
+1 −1 backend/dependencies/UsersHub-authentification-module
+1 −1 backend/dependencies/Utils-Flask-SQLAlchemy-Geo
+1 −0 backend/geonature/app.py
+15 −2 backend/geonature/core/auth/routes.py
+5 −7 backend/geonature/core/gn_commons/routes.py
+37 −2 backend/geonature/core/gn_commons/schemas.py
+4 −4 backend/geonature/core/gn_meta/mtd/__init__.py
+5 −1 backend/geonature/core/gn_meta/mtd/mtd_utils.py
+1 −1 backend/geonature/core/gn_monitoring/routes.py
+10 −0 backend/geonature/core/gn_permissions/schemas.py
+0 −5 backend/geonature/tasks/__init__.py
+2 −2 backend/geonature/tests/test_commands.py
+19 −1 backend/geonature/tests/test_gn_commons.py
+26 −0 backend/geonature/tests/utils.py
+36 −1 backend/geonature/utils/celery.py
+1 −1 backend/requirements-common.in
+5 −5 backend/requirements-dependencies.in
+56 −59 backend/requirements-dev.txt
+47 −48 backend/requirements.txt
+17 −0 docs/CHANGELOG.md
+1 −1 frontend/.nvmrc
+1 −1 frontend/Dockerfile
+3,576 −4,858 frontend/package-lock.json
+1 −1 frontend/package.json
+1 −3 frontend/src/app/GN2CommonModule/form/dynamic-form-generator/dynamic-form.service.ts
+2 −1 frontend/src/app/app.module.ts
+7 −8 frontend/src/app/components/auth/auth.service.ts
+6 −2 frontend/src/app/modules/login/login/login.component.ts
+45 −1 frontend/src/app/modules/login/routes-guard.service.ts
+6 −1 frontend/src/app/routing/app-routing.module.ts
+2 −2 frontend/src/assets/i18n/en.json
+8 −8 frontend/src/assets/i18n/fr.json
+3 −3 install/install_all/install_all.ini
2 changes: 1 addition & 1 deletion sources/TaxHub
Submodule TaxHub updated 8 files
+1 −1 VERSION
+18 −13 apptax/taxonomie/commands/migrate_taxref/README.rst
+1 −1 dependencies/RefGeo
+1 −1 dependencies/UsersHub-authentification-module
+1 −1 dependencies/Utils-Flask-SQLAlchemy-Geo
+5 −0 docs/changelog.md
+21 −23 requirements-dev.txt
+17 −17 requirements.txt
2 changes: 1 addition & 1 deletion sources/UsersHub
Submodule UsersHub updated 4 files
+1 −1 VERSION
+8 −0 docs/changelog.rst
+31 −30 requirements-dev.txt
+31 −30 requirements.txt

0 comments on commit 3149c0d

Please sign in to comment.