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

Merge branch 'develop'

parents 124850bb 96783864
Pipeline #5260 failed with stage
in 9 seconds
...@@ -8,8 +8,9 @@ ...@@ -8,8 +8,9 @@
} }
], ],
"require": { "require": {
"unicaen/app": "dev-zf-3.x", "php": "7.3.*",
"unicaen/bjy-authorize": "dev-zf-3.x", "unicaen/app": "^3.0",
"unicaen/bjy-authorize": "^3.0",
"jasig/phpcas": "^1.3", "jasig/phpcas": "^1.3",
"ramsey/uuid": "^3.7" "ramsey/uuid": "^3.7"
}, },
......
This diff is collapsed.
...@@ -69,10 +69,6 @@ CREATE INDEX idx_privilege_id on role_privilege(privilege_id); ...@@ -69,10 +69,6 @@ CREATE INDEX idx_privilege_id on role_privilege(privilege_id);
-- Données -- 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 INSERT INTO user_role (id, role_id, is_default, parent_id) VALUES
(1, 'Standard', 1, NULL), (1, 'Standard', 1, NULL),
(2, 'Gestionnaire', 0, 1), (2, 'Gestionnaire', 0, 1),
...@@ -94,6 +90,9 @@ INSERT INTO role_privilege (role_id, privilege_id) VALUES ...@@ -94,6 +90,9 @@ INSERT INTO role_privilege (role_id, privilege_id) VALUES
(4, 3), (4, 3),
(4, 4); (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 INSERT INTO user (username, email, display_name, password, state) VALUES
-- utilisateur demo/azerty -- utilisateur demo/azerty
('demo', 'demo@mail.fr', 'Demo', '$2y$10$PxXnVLYnGEzEnfqPqRKJSe9AabocES2H4bBK5VzzJlzuj1rVt7Lwu', 1); ('demo', 'demo@mail.fr', 'Demo', '$2y$10$PxXnVLYnGEzEnfqPqRKJSe9AabocES2H4bBK5VzzJlzuj1rVt7Lwu', 1);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment