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

sails/src/api/controllers/ServerController.js

@@ -11,7 +11,9 @@ module.exports = {
    * @param  {response} res {}
    * @param  {response} res {}
    */
    */
   ping: function (req, res) {
   ping: function (req, res) {
-    res.ok();
+    res.ok({
+      version: sails.config.pictogram
+    });
   },
   },
 
 
   /**
   /**
@@ -21,6 +23,8 @@ module.exports = {
    * @param  {response} res {}
    * @param  {response} res {}
    */
    */
   ping_session: function (req, res) {
   ping_session: function (req, res) {
-    res.ok();
+    res.ok({
+      version: sails.config.pictogram
+    });
   }
   }
 };
 };

sails/src/config/pictogram.js

@@ -5,6 +5,7 @@ var ASSETS_PATH = path.join(__dirname, '..', 'assets');
 var UPLOAD_PATH = path.join(__dirname, '..', '..', 'upload');
 var UPLOAD_PATH = path.join(__dirname, '..', '..', 'upload');
 
 
 module.exports.pictogram = {
 module.exports.pictogram = {
+  version: "0.1", // actual version of the server, to be checked by the client
   admin: {
   admin: {
     email: 'amontejo@ujaen.es',
     email: 'amontejo@ujaen.es',
     password: '$2a$06$flEEOc15SerMeYWARrN9w.KSpJuM.jDsaTgrtD0ESzbxKHPl0f/zq' //y00ttaa!!
     password: '$2a$06$flEEOc15SerMeYWARrN9w.KSpJuM.jDsaTgrtD0ESzbxKHPl0f/zq' //y00ttaa!!