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

Merge branch 'hotfix_parametre_intervention'

parents c527fa5c ff5d57f0

composer.json

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

        "ramsey/uuid":                   "^3.3",

        "unicaen/app":                   "^3.1",

        "unicaen/auth":                  "dev-release-3.2.0 as 3.1.2",

        "unicaen/auth":                  "dev-release-3.2.0",

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

        "unicaen/code":                  "^3.0",

        "unicaen/db-import":             "^3.1",

composer.lock

+2 −9
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": "a726480d5d45b634617a92d3f08be01b",

    "content-hash": "96f7e1a50a95226e8fcf609f1459d7cc",

    "packages": [

        {

            "name": "beberlei/assert",
@@ -7952,14 +7952,7 @@ 
            "time": "2019-06-11T19:33:38+00:00"

        }

    ],

    "aliases": [

        {

            "alias": "3.1.2",

            "alias_normalized": "3.1.2.0",

            "version": "dev-release-3.2.0",

            "package": "unicaen/auth"

        }

    ],

    "aliases": [],

    "minimum-stability": "stable",

    "stability-flags": {

        "unicaen/auth": 20

doc/release-notes/v2.1.6.md

+2 −0
Original line number Diff line number Diff line
@@ -182,4 +182,6 @@ where not exists ( 
    select * from role_privilege where role_id = p2r.role_id and privilege_id = pp.privilege_id

)

;



INSERT INTO SYGAL_TEST.SOUTENANCE_CONFIGURATION (ID, CODE, LIBELLE, VALEUR) VALUES (18, 'PERIODE_INTERVENTION_DIRECTEUR', 'Période autorisant les directeurs à intervenir', '7');

```