Merge branch 'master' of http://gitlab.ujaen.es/yotta/pictogram

sails/src/CHANGES.md

 # Changes
 # Changes
 
 
-Changes to be performed manually in servers to upgrade
+Nothing to do
 
 
 ## Database
 ## Database
 
 
-Already done in dev:
-
-- update arasaac uri
-  `source update_arasaac_color_uri.sql`
-
-- add B&W arasaac pictos
-  `source arasaac_byn.sql`
-
-- create scene table
-  `CREATE TABLE IF NOT EXISTS `scene` (
-    `id` int(11) NOT NULL AUTO_INCREMENT,
-    `name` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
-    `categories` boolean NOT NULL DEFAULT 0,
-    `id_sup` int(11) DEFAULT NULL,
-    `id_stu` int(11) NOT NULL,
-    PRIMARY KEY (`id`),
-    FOREIGN KEY (`id_sup`) REFERENCES `supervisor` (`id`),
-    FOREIGN KEY (`id_stu`) REFERENCES `student` (`id`)
-  ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1
-  COMMENT="Scene table information. Every scene is related to some stu_pictos";`
-
-  - Add id_active_scene to student table
-    `ALTER TABLE student ADD COLUMN id_active_scene INT(11) DEFAULT NULL;`
-    `ALTER TABLE student ADD CONSTRAINT fk_active_scene FOREIGN KEY (`id_active_scene`) REFERENCES scene (`id`);`
-
-  - alter table stu_picto to add new reference to scene
-  `ALTER TABLE `stu_picto` ADD id_scene int(11) NOT NULL;`
-  `ALTER TABLE `stu_picto` ADD CONSTRAINT `stu_picto_scene_fk` FOREIGN KEY (`id_scene`) REFERENCES `scene` (`id`) ON DELETE CASCADE;`
-      (si hay problema al añadir la foreign key, hacer SET FOREIGN_KEY_CHECKS = 0; antes de añadirla y SET FOREIGN_KEY_CHECKS = 1; después)
-
-  - load default scenes procedure
-  `source /vagrant/roles/database/files/scene_adapt.sql`
-
-  - Reload enrolments trigger
-  `source /vagrant/roles/database/files/triggers-enrolments-integrity-constraints.sql`
-
-  - Reload triggers-sessions-integrity-constraints.sql
+Nothing to do