Skip to content

yotta / pictogram

Go to a project
Commit a78b4b1f by Fernando Martínez Santiago
Options

Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into fernando_branch

parents 1d766745 3b74f2c5
Inline Side-by-side
Showing with 3 additions and 3 deletions
sails/src/assets/scripts/modules/student/controllers/collections.js
......@@ -149,7 +149,7 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
action: 'delete',
attributes: {
id_stu: $scope.studentData.id,
stu_picto: studentPicto.id
stu_picto: studentPicto
}
}, function () {});
......@@ -175,7 +175,7 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
action: 'delete',
attributes: {
id_stu: $scope.studentData.id,
stu_picto: studentPicto.id
stu_picto: studentPicto
}
}, function () {});
......
sails/src/config/sockets.js
......@@ -13,7 +13,7 @@
module.exports.sockets = {
pingTimeout: 20000, // set timeout to 20 secs
pingTimeout: 60000, // set timeout to 60 secs
/***************************************************************************
* *
......
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