Commit a2046795 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'ModuleThese' into release_5.2.1

parents 9e2dcf2b 5a6a69ca

.dockerignore

+0 −4
Changes for .dockerignore: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line 
/config/autoload/*local*.php



/data/db/

/data/cache/

/data/DoctrineModule/

/data/DoctrineORMModule/

/vendor

/upload



/tmp/

/docker/

/migration/



/etabs/



.DS_Store

.idea/

.~*

composer.lock

+3 −3
Changes for composer.lock: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -9675,11 +9675,11 @@ 
        },

        {

            "name": "unicaen/app",

            "version": "5.1.0",

            "version": "5.1.1",

            "source": {

                "type": "git",

                "url": "https://git.unicaen.fr/lib/unicaen/app.git",

                "reference": "668b2bb9fdc5ae74e8d0a8b162be906b9312bbb0"

                "reference": "a33031035fb8d582837753bd13c138af97136ab2"

            },

            "require": {

                "beberlei/assert": "^2.9",
@@ -9735,7 +9735,7 @@ 
                ]

            },

            "description": "Module de base des applications unicaen",

            "time": "2022-05-02T09:49:38+00:00"

            "time": "2022-09-13T15:20:27+00:00"

        },

        {

            "name": "unicaen/auth",

config/application.config.php

+1 −0
Changes for config/application.config.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ return [ 
        'UnicaenPdf',

        'UnicaenRenderer',

        'Structure',

        'These',

        'Fichier',

        'Import',

        'Indicateur',

config/autoload/global.php

+2 −2
Changes for config/autoload/global.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ $config = [ 
        'page_de_couverture' => [

            'template' => [

                // template .phtml

                'phtml_file_path' => APPLICATION_DIR . '/module/Application/view/application/these/page-de-couverture/pagedecouverture.phtml',

                'phtml_file_path' => APPLICATION_DIR . '/module/These/view/these/these/page-de-couverture/pagedecouverture.phtml',

                // feuille de styles

                'css_file_path' => APPLICATION_DIR . '/module/Application/view/application/these/page-de-couverture/pagedecouverture.css',

                'css_file_path' => APPLICATION_DIR . '/module/These/view/these/these/page-de-couverture/pagedecouverture.css',

            ],

        ],

        // Options pour le test d'archivabilité

config/autoload/local.php.dist

+2 −2
Changes for config/autoload/local.php.dist: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -10,9 +10,9 @@ return [ 
        'page_de_couverture' => [

            'template' => [

                // template .phtml

                'phtml_file_path' => APPLICATION_DIR . '/module/Application/view/application/these/page-de-couverture/pagedecouverture.phtml',

                'phtml_file_path' => APPLICATION_DIR . '/module/These/view/these/these/page-de-couverture/pagedecouverture.phtml',

                // feuille de styles

                'css_file_path' => APPLICATION_DIR . '/module/Application/view/application/these/page-de-couverture/pagedecouverture.css',

                'css_file_path' => APPLICATION_DIR . '/module/These/view/these/these/page-de-couverture/pagedecouverture.css',

            ],

        ],

        'archivabilite' => [