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

Merge branch 'feature_filtre_annee_catalogue_formation' into release_7.0.2

parents df069f98 a0dfb54b

CHANGELOG.md

+8 −0
Changes for CHANGELOG.md: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line 
Journal des modifications

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



8.0.0

-----

- Nouveau module Admission (Formulaire permettant de candidater à un parcours doctoral)

  - Saisie des informations concernant l'étudiant, son parcours, son inscription et ses spécifités et le financement

  - Dépôt de pièces justificatives

  - Remplissage et validation en ligne de la convention de formation doctorale

  - Validation en ligne de la charte doctorale



7.0.1

-----

- [FIX] Module Substitutions : plantage de la page consacrée aux doublons (substitutions possibles).

bin/run-import.sh

+11 −10
Changes for bin/run-import.sh: 11 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -56,16 +56,17 @@ if [ -z "$SERVICE" ]; then 
  SERVICES[1]='etablissement'

  SERVICES[2]='ecole-doctorale'

  SERVICES[3]='unite-recherche'

  SERVICES[4]='individu'

  SERVICES[5]='doctorant'

  SERVICES[6]='these'

  SERVICES[7]='these-annee-univ'

  SERVICES[8]='role'

  SERVICES[9]='acteur'

  SERVICES[10]='origine-financement'

  SERVICES[11]='financement'

  SERVICES[12]='titre-acces'

  SERVICES[13]='variable'

  SERVICES[4]='composante-enseignement'

  SERVICES[5]='individu'

  SERVICES[6]='doctorant'

  SERVICES[7]='these'

  SERVICES[8]='these-annee-univ'

  SERVICES[9]='role'

  SERVICES[10]='acteur'

  SERVICES[11]='origine-financement'

  SERVICES[12]='financement'

  SERVICES[13]='titre-acces'

  SERVICES[14]='variable'

  for SERVICE in ${SERVICES[@]}; do

    run ${SERVICE}

  done

codeEtablissement

0 → 100644
+0 −0

Empty file added.

composer.json

+3 −1
Changes for composer.json: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -73,12 +73,14 @@ 
        "unicaen/pdf": "6.1.0",

        "unicaen/renderer": "^6.0",

        "unicaen/sygal-api": "dev-master",

        "unicaen/zfc-user": "^5.0"

        "unicaen/zfc-user": "^5.0",

        "unicaen/etat": "^6.0"

    },

    "minimum-stability": "dev",

    "prefer-stable": true,

    "autoload": {

        "psr-0": {

            "Admission\\": "module/Admission/src",

            "Application\\": "module/Application/src",

            "ComiteSuiviIndividuel\\": "module/ComiteSuiviIndividuel/src",

            "Depot\\": "module/Depot/src",

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
@@ -81,6 +81,7 @@ return [ 
        'Doctorant',

        'StepStar',

        'InscriptionAdministrative',

        'Admission',

        'Application',

        'Substitution',

        'SygalApi',