From: Motion Team <team@xcally.com>
Date: Mon, 7 Dec 2015 17:00:20 +0000 (+0100)
Subject: 0.0.5 | Built motion from commit b4141bc.
X-Git-Tag: 0.0.5
X-Git-Url: http://repos.xcallymotion.com/base//%22./banner.jpg/%22?a=commitdiff_plain;h=02287c40f3e0383f97e7525bcbc0fcfa3121994a;p=motion.git

0.0.5 | Built motion from commit b4141bc.
---

diff --git a/package.json b/package.json
index a3757ac..9397b7b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "motion",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "main": "server/app.js",
   "dependencies": {
     "accept-language-parser": "^1.0.2",
diff --git a/release-notes/changelog_0.0.4.txt b/release-notes/changelog_0.0.5.txt
similarity index 95%
rename from release-notes/changelog_0.0.4.txt
rename to release-notes/changelog_0.0.5.txt
index 7e5d690..510fbb7 100644
--- a/release-notes/changelog_0.0.4.txt
+++ b/release-notes/changelog_0.0.5.txt
@@ -1,5 +1,9 @@
 # xCALLY MOTION Changelog
 
+- * b4141bc - 2015-12-07: config.son + config_history.son 
+- * d789675 - 2015-12-07: gitignore 
+- * 0a1dc33 - 2015-12-07: test remove config.son 
+- * 642a19d - 2015-12-07: server side API update 
 - * 872c986 - 2015-12-07: test commit 
 - * edef880 - 2015-12-07: new version 
 - * ae382fb - 2015-12-07: server side API 
diff --git a/server/api/update/update.controller.js b/server/api/update/update.controller.js
index 65546fc..6ae1d16 100644
--- a/server/api/update/update.controller.js
+++ b/server/api/update/update.controller.js
@@ -38,7 +38,7 @@ exports.show = function(req, res) {
 // Get a single update
 exports.pull = function(req, res) {
   Git
-    .reset('soft', function(err, update) {
+    .reset('hard', function(err, update) {
       console.log('update', update);
       if (err) {
         return handleError(res, err);
diff --git a/server/app.json b/server/app.json
index 757879b..750999c 100644
--- a/server/app.json
+++ b/server/app.json
@@ -5,7 +5,7 @@
     "env": {
       "NODE_ENV": "production"
     },
-    "cwd": "/var/opt/motion",
+    "cwd": "/var/opt/motion/server",
     "error_file": "/var/log/xcally/motion-err.log",
     "out_file": "/var/log/xcally/motion-out.log",
     "watch": ["package.json"]
diff --git a/server/config/environment/config_history.json b/server/config/environment/config_history.json
index b28da56..2685297 100644
--- a/server/config/environment/config_history.json
+++ b/server/config/environment/config_history.json
@@ -2,9 +2,9 @@
   "development": {
     "host": "localhost",
     "port": 3306,
-    "database": "xcally",
-    "username": "root",
-    "password": "peppe88",
+    "database": "motion",
+    "username": "xcall",
+    "password": "xC@LL1234",
     "dialect": "mysql"
   },
   "test": {