Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
yotta
/
pictogram
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
60
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
a78b4b1f
authored
Sep 03, 2016
by
Fernando Martínez Santiago
Browse files
Options
_('Browse Files')
Download
Plain Diff
Merge branch 'develop' of
http://scm.ujaen.es/softuno/pictogram
into fernando_branch
parents
1d766745
3b74f2c5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
sails/src/assets/scripts/modules/student/controllers/collections.js
sails/src/config/sockets.js
sails/src/assets/scripts/modules/student/controllers/collections.js
View file @
a78b4b1f
...
...
@@ -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
View file @
a78b4b1f
...
...
@@ -13,7 +13,7 @@
module
.
exports
.
sockets
=
{
pingTimeout
:
20000
,
// set timeout to 2
0 secs
pingTimeout
:
60000
,
// set timeout to 6
0 secs
/***************************************************************************
* *
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment