Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

archivesPubliques
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

15db440c

Commit 15db440c authored 1 year ago by Cyril Vazquez

Downloads
- Plain Diff

Merge branch 'develop' into 'master'

Develop to master for 2.9.5

See merge request maarch/archivesPubliques!284

parents 51ffa588 48776ba0

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 15 additions, 0 deletions

CHANGELOG.md
MIGRATION.md 15 additions, 0 deletions

MIGRATION.md
bundle/archivesPubliques/Controller/content.php 2 additions, 2 deletions

bundle/archivesPubliques/Controller/content.php
bundle/archivesPubliques/Resources/xslt/restitution_v02totransfer_v20.xsl 8 additions, 14 deletions

...ubliques/Resources/xslt/restitution_v02totransfer_v20.xsl
bundle/seda/Controller/ArchiveTransfer.php 40 additions, 65 deletions

bundle/seda/Controller/ArchiveTransfer.php
bundle/seda2/Controller/ArchiveTransferReceptionTrait.php 4 additions, 0 deletions

bundle/seda2/Controller/ArchiveTransferReceptionTrait.php
bundle/seda2/Controller/ArchiveTransferValidationTrait.php 4 additions, 1 deletion

bundle/seda2/Controller/ArchiveTransferValidationTrait.php
data/conf/configuration.ini.default 17 additions, 2 deletions

data/conf/configuration.ini.default
data/sql/pgsql/default.sql 1 addition, 1 deletion

data/sql/pgsql/default.sql
presentation/maarchRM/Presenter/archivesPubliques/content.php 6 additions, 4 deletions

...entation/maarchRM/Presenter/archivesPubliques/content.php

with 112 additions and 89 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment