Skip to content

yotta / pictogram

Go to a project
Commit 1120a249 by Arturo Montejo Ráez
Options

Merge branch 'master' of http://scm.ujaen.es/softuno/pictogram

parents 462ea113 9ab0e3e6
Inline Side-by-side
Showing with 6 additions and 4 deletions
.gitignore
......@@ -25,8 +25,10 @@ sails/src/assets/scripts/config.js
sails/src/config/ssl/**/*.key
sails/src/config/ssl/**/*.crt
sails/src/config/ssl/**/*.csr
sails/src/config/ssl/**/*.pem
sails/src/config/local.js
sails/src/node_modules
sails/src/certbot.log
sails/.vagrant
sails/logs/
sails/npm-debug.log
......
sails/roles/database/files/test-autismojaen.sql
......@@ -52,7 +52,7 @@ INSERT IGNORE INTO `supervisor` (
'$2a$10$F/n1q5TLFMvebKIwE/MMNOEpTuGNK1p.Nc85on0ptvPPDR6QqGv4C',
true,
(SELECT id from office where email='belen.perez@autismojaen.es'),
'/upload/supervisors/belen.jpg'
'defaultAvatar.jpg'
);
UPDATE office
......@@ -184,7 +184,7 @@ INSERT IGNORE INTO `student` (
'2015-01-01',
'M',
'ES',
'/app/img/default.jpg',
'defaultAvatar.jpg',
NULL,
'es-es',
(SELECT id from office WHERE email='belen.perez@autismojaen.es'),
......@@ -197,7 +197,7 @@ INSERT IGNORE INTO `student` (
'2015-01-01',
'M',
'ES',
'/app/img/default.jpg',
'defaultAvatar.jpg',
NULL,
'es-es',
(SELECT id from office WHERE email='belen.perez@autismojaen.es'),
......@@ -210,7 +210,7 @@ INSERT IGNORE INTO `student` (
'2015-01-01',
'M',
'ES',
'/app/img/default.jpg',
'defaultAvatar.jpg',
NULL,
'es-es',
(SELECT id from office WHERE email='belen.perez@autismojaen.es'),
......
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 sign in to comment