Commit 024799dd authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'develop'

parents 124850bb 96783864

composer.json

+3 −2
Original line number Diff line number Diff line
@@ -8,8 +8,9 @@ 
        }

    ],

    "require": {

        "unicaen/app":                                  "dev-zf-3.x",

        "unicaen/bjy-authorize":                        "dev-zf-3.x",

        "php":                                          "7.3.*",

        "unicaen/app":                                  "^3.0",

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

        "jasig/phpcas":                                 "^1.3",

        "ramsey/uuid":                                  "^3.7"

    },

composer.lock

+1545 −858

File changed.

Preview size limit exceeded, changes collapsed.

data/schema.sqlite.sql

+3 −4
Original line number Diff line number Diff line
@@ -69,10 +69,6 @@ CREATE INDEX idx_privilege_id on role_privilege(privilege_id); 


-- Données



INSERT INTO user (username, email, display_name, password, state) VALUES

    -- utilisateur admin/azerty

    ('admin', 'admin@mail.fr', 'Administrateur', '$2y$10$QPbyqusyGOOuLlnRCmvZpuKDlAKorxtJJsjeW78bXnIKCFEE.bQiK', 1);



INSERT INTO user_role (id, role_id, is_default, parent_id) VALUES

    (1, 'Standard', 1, NULL),

    (2, 'Gestionnaire', 0, 1),
@@ -94,6 +90,9 @@ INSERT INTO role_privilege (role_id, privilege_id) VALUES 
    (4, 3),

    (4, 4);



INSERT INTO user (username, email, display_name, password, state) VALUES

    -- utilisateur admin/azerty

    ('admin', 'admin@mail.fr', 'Administrateur', '$2y$10$QPbyqusyGOOuLlnRCmvZpuKDlAKorxtJJsjeW78bXnIKCFEE.bQiK', 1);

INSERT INTO user (username, email, display_name, password, state) VALUES

    -- utilisateur demo/azerty

    ('demo', 'demo@mail.fr', 'Demo', '$2y$10$PxXnVLYnGEzEnfqPqRKJSe9AabocES2H4bBK5VzzJlzuj1rVt7Lwu', 1);