Commit 2072deab authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'ModuleRapportActivite'

parents 54bccec6 400fb743

CHANGELOG.md

+5 −0
Original line number Diff line number Diff line 
Journal des modifications

=========================



4.1.0

-----

- Refonte du module 'Rapports d'activité'.

- Nouveau document téléversable pour une structure : Signature figurant sur la page de validation d'un rapport d'activité.



4.0.6

-----

- Retour du logo ESUp-SyGAL dans la barre de menu principal.

composer.json

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
        "guzzlehttp/guzzle": "^6.3",

        "ramsey/uuid": "^3.3",

        "twig/twig": "^3.0",

        "unicaen/app": "^5.0",

        "unicaen/app": "^5.1",

        "unicaen/auth": "^5.1",

        "unicaen/auth-token": "^5.0",

        "unicaen/bjy-authorize": "^4.0",

composer.lock

+4 −4
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",

        "This file is @generated automatically"

    ],

    "content-hash": "4ee1ecfaf1fa4c6b33ceb73e715dcdd4",

    "content-hash": "1f4efe3765f143327d5e38bf0f744e12",

    "packages": [

        {

            "name": "beberlei/assert",
@@ -9341,11 +9341,11 @@ 
        },

        {

            "name": "unicaen/app",

            "version": "5.0.0",

            "version": "5.1.0",

            "source": {

                "type": "git",

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

                "reference": "1e649b804745f02a83873f223c06e7384a713eec"

                "reference": "668b2bb9fdc5ae74e8d0a8b162be906b9312bbb0"

            },

            "require": {

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

            },

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

            "time": "2022-02-07T15:19:29+00:00"

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

        },

        {

            "name": "unicaen/auth",

config/application.config.php

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ return [ 
        'UnicaenApp',

        'UnicaenAuth',

        'UnicaenAuthToken',

        'UnicaenAvis',

        'UnicaenLdap',

        'UnicaenDbImport',

        'UnicaenFaq',
@@ -37,6 +38,7 @@ return [ 
        'Indicateur',

        'Retraitement',

        'Soutenance',

        'RapportActivite',

        'Notification',

        'Information',

        'Doctorant',

config/autoload/global.php

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ $config = [ 
            // Resaisir les attestations ? Sinon celles saisies au 1er dépôt sont reprises/dupliquées.

            'resaisir_attestations' => true,

        ],

        // Options concernant les rapports (activité, CSI, mi-parcours)

        // Options concernant les rapports (CSI, mi-parcours)

        'rapport' => [

            // Page de couverture des rapports d'activité déposés

            'page_de_couverture' => [