Commit d1174550 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

merging

parents f90f8729 edb693a5
Loading
Loading
Loading
Loading
+19
Changes for .dockerignore: 19 added lines, 0 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/
.~*
.sass-cache/
+57
Changes for CHANGELOG.md: 57 added lines, 0 removed lines.
Original line number Diff line number Diff line
Journal des modifications
=========================

4.1.3
-----
- [FIX] Balises <img> des logos/signatures dont la src est le contenu binaire : le format était systématiquement 
  'image/png' ce qui posait problème si l'image était d'un autre format.

4.1.2
-----
- [FIX] Plantage du formulaire de création d'un avis sur un rapport d'activité.

4.1.1
-----
- Rapports d'activité de fin de contrat : aucun avis Dir/UR nécessaire dans le rapport lui-meme donc on écarte les 
  compléments qui génèreraient une case à cocher permettant de signaler une absence d'avis.
- Module Rapports d'activité : corrections cosmétiques.
- [FIX] Passage à unicaen/db-import 5.1.2 pour corriger le plantage lors de la création d'une structure.

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. 
  Assombrissement du bleu dans la barre de menu principal et dans le pied de page.
- [FIX] Plantage lors de la création d'une structure (ED, UR, établissement).

4.0.5
-----
- [FIX] Correction du plantage de la page de saisie du mail perso doctorant.

4.0.4
-----
- Correction de typos dans mail de feu vert de la soutenance
- Ajout de redirection de mail lorsque certains mails n'ont pas de destinataire "ATTENTION MAIL NON DÉLIVRÉ".
- Compléments d'individu : mise en place des éléments de base 
- Modification du texte de mail de réussite au doctorat
- [FIX] verification des assertions au niveau des actions de PropositionController

4.0.3
-----
- Corrections et améliorations de la doc d'install suite aux remarques de l'université de Montpellier (merci)
- [FIX] Correction de l'affichage de la date d'historisation dans Individu lié
- [FIX] Correction de la signature de Membre::setEtablissement(?string) qui faisait planter la création de proprosition (lorsqu'aucun établissement n'était fourni)
- Ajout de l'unité de recherche des acteurs (manuel pour le moment) pour améliorer les pages de couverture

4.0.2
-----
- [FIX] Affichage de la bonne adresse électronique institutionnelle sur la fiche thèse 
- [FIX] Correction de la classe css sur les card de la page des soutenances à venir

4.0.1
-----
- [FIX] signature des fonctions de StructureSubstitHelper string => ?string
- [FIX] les résumés pour la BU se chevauchaient p class='resume pre-scrollable' => p class='pre-scrollable'
- [FIX] ajustement des css de la page proposition

4.0.0
-----
- Migration vers Laminas (back-end PHP).
+17
Changes for Dockerfile: 17 added lines, 0 removed lines.
Original line number Diff line number Diff line
###########################################################################################
#
#                             Image pour l'application SyGAL.
#
###########################################################################################

ARG PHP_VERSION

FROM registre.unicaen.fr:5000/open-source/docker/sygal-image:php${PHP_VERSION}

LABEL maintainer="Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>"

COPY . /app

WORKDIR /app

#RUN composer install
+2 −7
Changes for composer.json: 2 added lines, 7 removed lines.
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",
@@ -68,12 +68,7 @@
            "mkdir -p vendor/mpdf/mpdf/ttfontdata && chmod -R 777 vendor/mpdf/mpdf/ttfontdata",
            "mkdir -p data/cache && chmod -R 777 data/cache && rm -rf data/cache/*",
            "mkdir -p data/DoctrineModule/cache && chmod -R 777 data/DoctrineModule/cache && rm -rf data/DoctrineModule/cache/*",
            "mkdir -p data/DoctrineORMModule/Proxy && chmod -R 777 data/DoctrineORMModule/Proxy && rm -rf data/DoctrineORMModule/Proxy/*",
            "vendor/bin/doctrine-module orm:clear-cache:query",
            "vendor/bin/doctrine-module orm:clear-cache:metadata",
            "vendor/bin/doctrine-module orm:clear-cache:result",
            "vendor/bin/doctrine-module orm:generate-proxies",
            "vendor/bin/laminas-development-mode disable"
            "mkdir -p data/DoctrineORMModule/Proxy && chmod -R 777 data/DoctrineORMModule/Proxy && rm -rf data/DoctrineORMModule/Proxy/*"
        ]
    }
}
+63 −19
Changes for composer.lock: 63 added lines, 19 removed lines.
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",
@@ -1811,16 +1811,16 @@
        },
        {
            "name": "guzzlehttp/guzzle",
            "version": "6.5.5",
            "version": "6.5.7",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/guzzle.git",
                "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e"
                "reference": "724562fa861e21a4071c652c8a159934e4f05592"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
                "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/724562fa861e21a4071c652c8a159934e4f05592",
                "reference": "724562fa861e21a4071c652c8a159934e4f05592",
                "shasum": ""
            },
            "require": {
@@ -1857,10 +1857,40 @@
                "MIT"
            ],
            "authors": [
                {
                    "name": "Graham Campbell",
                    "email": "hello@gjcampbell.co.uk",
                    "homepage": "https://github.com/GrahamCampbell"
                },
                {
                    "name": "Michael Dowling",
                    "email": "mtdowling@gmail.com",
                    "homepage": "https://github.com/mtdowling"
                },
                {
                    "name": "Jeremy Lindblom",
                    "email": "jeremeamia@gmail.com",
                    "homepage": "https://github.com/jeremeamia"
                },
                {
                    "name": "George Mponos",
                    "email": "gmponos@gmail.com",
                    "homepage": "https://github.com/gmponos"
                },
                {
                    "name": "Tobias Nyholm",
                    "email": "tobias.nyholm@gmail.com",
                    "homepage": "https://github.com/Nyholm"
                },
                {
                    "name": "Márk Sági-Kazár",
                    "email": "mark.sagikazar@gmail.com",
                    "homepage": "https://github.com/sagikazarmark"
                },
                {
                    "name": "Tobias Schultze",
                    "email": "webmaster@tubo-world.de",
                    "homepage": "https://github.com/Tobion"
                }
            ],
            "description": "Guzzle is a PHP HTTP client library",
@@ -1876,9 +1906,23 @@
            ],
            "support": {
                "issues": "https://github.com/guzzle/guzzle/issues",
                "source": "https://github.com/guzzle/guzzle/tree/6.5"
                "source": "https://github.com/guzzle/guzzle/tree/6.5.7"
            },
            "time": "2020-06-16T21:01:06+00:00"
            "funding": [
                {
                    "url": "https://github.com/GrahamCampbell",
                    "type": "github"
                },
                {
                    "url": "https://github.com/Nyholm",
                    "type": "github"
                },
                {
                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle",
                    "type": "tidelift"
                }
            ],
            "time": "2022-06-09T21:36:50+00:00"
        },
        {
            "name": "guzzlehttp/promises",
@@ -1966,16 +2010,16 @@
        },
        {
            "name": "guzzlehttp/psr7",
            "version": "1.8.3",
            "version": "1.8.5",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/psr7.git",
                "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85"
                "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/guzzle/psr7/zipball/1afdd860a2566ed3c2b0b4a3de6e23434a79ec85",
                "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85",
                "url": "https://api.github.com/repos/guzzle/psr7/zipball/337e3ad8e5716c15f9657bd214d16cc5e69df268",
                "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268",
                "shasum": ""
            },
            "require": {
@@ -2056,7 +2100,7 @@
            ],
            "support": {
                "issues": "https://github.com/guzzle/psr7/issues",
                "source": "https://github.com/guzzle/psr7/tree/1.8.3"
                "source": "https://github.com/guzzle/psr7/tree/1.8.5"
            },
            "funding": [
                {
@@ -2072,7 +2116,7 @@
                    "type": "tidelift"
                }
            ],
            "time": "2021-10-05T13:56:00+00:00"
            "time": "2022-03-20T21:51:18+00:00"
        },
        {
            "name": "jasig/phpcas",
@@ -9341,11 +9385,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 +9445,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",
@@ -9557,11 +9601,11 @@
        },
        {
            "name": "unicaen/db-import",
            "version": "5.1.1",
            "version": "5.1.2",
            "source": {
                "type": "git",
                "url": "https://git.unicaen.fr/lib/unicaen/db-import.git",
                "reference": "e72f69f5e6a62184b3666dfc474dbda2a53015ea"
                "reference": "33dd5824e3f1969b8c0e9ca7518c041432adea72"
            },
            "require": {
                "beberlei/assert": "^2.7",
@@ -9593,7 +9637,7 @@
                }
            },
            "description": "Module d'import entre bases de données",
            "time": "2022-03-02T17:17:17+00:00"
            "time": "2022-05-31T12:30:42+00:00"
        },
        {
            "name": "unicaen/faq",
Loading