From 6593afab991479d7e562a29e2e20107e42bd6a3b Mon Sep 17 00:00:00 2001
From: Motion Team <team@xcally.com>
Date: Mon, 21 Dec 2015 17:21:00 +0100
Subject: [PATCH] Built motion from commit 74ce333.|0.0.13

---
 package.json                                       |    2 +-
 release-notes/changelog_0.0.12.txt                 |   49 -------------------
 release-notes/changelog_0.0.13.txt                 |   51 ++++++++++++++++++++
 .../desk_configuration.controller.js               |    4 +-
 server/api/desk_field/desk_field.controller.js     |    4 +-
 .../salesforce_account.controller.js               |    4 +-
 .../salesforce_configuration.controller.js         |    4 +-
 .../salesforce_field.controller.js                 |    4 +-
 8 files changed, 62 insertions(+), 60 deletions(-)
 delete mode 100644 release-notes/changelog_0.0.12.txt
 create mode 100644 release-notes/changelog_0.0.13.txt

diff --git a/package.json b/package.json
index e6611ad..9ca0eb8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "motion",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "main": "server/app.js",
   "dependencies": {
     "accept-language-parser": "^1.0.2",
diff --git a/release-notes/changelog_0.0.12.txt b/release-notes/changelog_0.0.12.txt
deleted file mode 100644
index 240dff1..0000000
--- a/release-notes/changelog_0.0.12.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-# xCALLY MOTION Changelog
-
-- * eab16ba - 2015-12-21: Updated contact manager 
-- * 22bd792 - 2015-12-21: server side config socketio.js 
-- * 481a45a - 2015-12-21: server side bower.json 
-- * aaa7b73 - 2015-12-21: server side models 
-- * 053030b - 2015-12-21: server side config smtp 
-- * 790b16e - 2015-12-21: server side components chatty 
-- * 18f3367 - 2015-12-21: server side api 
-- * 122d687 - 2015-12-21: client side components 
-- * 3d0b3d1 - 2015-12-21: client side app.js 
-- * 5ff9ce0 - 2015-12-21: client side app 
-- * 4799f81 - 2015-12-18: salesforce: subject, body and field configuration, custom filter for fields 
-- * 05a9e60 - 2015-12-17: Updated contact manager and triggers service 
-- * 094e572 - 2015-12-17: salesforce: account wizard 
-- * 3a8fae9 - 2015-12-17: remove node-salesforce package 
-- * e324ea1 - 2015-12-17: Salesforce: account list 
-- * bc6bbcd - 2015-12-17: add jsforce dependencies 
-- * f65d9aa - 2015-12-17: add remote validation on desk.com account wizard 
-- * 50c047b - 2015-12-17: SMTP init 
-- * 7a30973 - 2015-12-17: new version 
-- * ef263d0 - 2015-12-17: dependancies update 
-- * 90831ca - 2015-12-16: server side smtp 
-- * c3fb836 - 2015-12-16: client side mail 
-- * 4f89e39 - 2015-12-16: server side api 
-- * cd1f7de - 2015-12-16: client app mail 
-- * 039434b - 2015-12-16: Changed triggers service; Added call status for triggers conditions. 
-- * 4fb44b0 - 2015-12-16: server side app.js 
-- * 4e6cafb - 2015-12-16: server side config 
-- * 4a15a39 - 2015-12-16: server side models 
-- * cf03b95 - 2015-12-16: server side config 
-- * e5efa4f - 2015-12-16: server side api 
-- * 6ef18d6 - 2015-12-16: client side components quickSidebar 
-- * 1ac76f7 - 2015-12-16: client assets languages 
-- * ca03462 - 2015-12-16: client side app mail inbox 
-- * db25e17 - 2015-12-16: desk.com: add system fields 
-- * 78e3a7f - 2015-12-16: grunt file update: add &#x27;/login&#x27; 
-- * 9590fb1 - 2015-12-16: desk.com: field configuration (only custom fields) 
-- * 4937169 - 2015-12-16: desk.com: subject and description configuration 
-- * 5a5aead - 2015-12-15: fixed callysquare undo 
-- * bf7fa27 - 2015-12-15: fixed cally square design overflow 
-- * c4d70ec - 2015-12-15: Language update 
-- * d77c09d - 2015-12-15: Desk integration: view settings 
-- * 9f29458 - 2015-12-15: changed chat settings label (remote address) 
-- * 4706f4d - 2015-12-15: remove comment 
-- * c8840c4 - 2015-12-15: Language update 
-- * 18ac799 - 2015-12-14: comment route and socket.io 
-- * 972448f - 2015-12-14: Desk.com integration: add wizard 
-
diff --git a/release-notes/changelog_0.0.13.txt b/release-notes/changelog_0.0.13.txt
new file mode 100644
index 0000000..1e6f195
--- /dev/null
+++ b/release-notes/changelog_0.0.13.txt
@@ -0,0 +1,51 @@
+# xCALLY MOTION Changelog
+
+- * 7031e61 - 2015-12-21: Manage Update 
+- * 39a57b8 - 2015-12-21: update controller function for compatibility 
+- * eab16ba - 2015-12-21: Updated contact manager 
+- * 22bd792 - 2015-12-21: server side config socketio.js 
+- * 481a45a - 2015-12-21: server side bower.json 
+- * aaa7b73 - 2015-12-21: server side models 
+- * 053030b - 2015-12-21: server side config smtp 
+- * 790b16e - 2015-12-21: server side components chatty 
+- * 18f3367 - 2015-12-21: server side api 
+- * 122d687 - 2015-12-21: client side components 
+- * 3d0b3d1 - 2015-12-21: client side app.js 
+- * 5ff9ce0 - 2015-12-21: client side app 
+- * 4799f81 - 2015-12-18: salesforce: subject, body and field configuration, custom filter for fields 
+- * 05a9e60 - 2015-12-17: Updated contact manager and triggers service 
+- * 094e572 - 2015-12-17: salesforce: account wizard 
+- * 3a8fae9 - 2015-12-17: remove node-salesforce package 
+- * e324ea1 - 2015-12-17: Salesforce: account list 
+- * bc6bbcd - 2015-12-17: add jsforce dependencies 
+- * f65d9aa - 2015-12-17: add remote validation on desk.com account wizard 
+- * 50c047b - 2015-12-17: SMTP init 
+- * 7a30973 - 2015-12-17: new version 
+- * ef263d0 - 2015-12-17: dependancies update 
+- * 90831ca - 2015-12-16: server side smtp 
+- * c3fb836 - 2015-12-16: client side mail 
+- * 4f89e39 - 2015-12-16: server side api 
+- * cd1f7de - 2015-12-16: client app mail 
+- * 039434b - 2015-12-16: Changed triggers service; Added call status for triggers conditions. 
+- * 4fb44b0 - 2015-12-16: server side app.js 
+- * 4e6cafb - 2015-12-16: server side config 
+- * 4a15a39 - 2015-12-16: server side models 
+- * cf03b95 - 2015-12-16: server side config 
+- * e5efa4f - 2015-12-16: server side api 
+- * 6ef18d6 - 2015-12-16: client side components quickSidebar 
+- * 1ac76f7 - 2015-12-16: client assets languages 
+- * ca03462 - 2015-12-16: client side app mail inbox 
+- * db25e17 - 2015-12-16: desk.com: add system fields 
+- * 78e3a7f - 2015-12-16: grunt file update: add &#x27;/login&#x27; 
+- * 9590fb1 - 2015-12-16: desk.com: field configuration (only custom fields) 
+- * 4937169 - 2015-12-16: desk.com: subject and description configuration 
+- * 5a5aead - 2015-12-15: fixed callysquare undo 
+- * bf7fa27 - 2015-12-15: fixed cally square design overflow 
+- * c4d70ec - 2015-12-15: Language update 
+- * d77c09d - 2015-12-15: Desk integration: view settings 
+- * 9f29458 - 2015-12-15: changed chat settings label (remote address) 
+- * 4706f4d - 2015-12-15: remove comment 
+- * c8840c4 - 2015-12-15: Language update 
+- * 18ac799 - 2015-12-14: comment route and socket.io 
+- * 972448f - 2015-12-14: Desk.com integration: add wizard 
+
diff --git a/server/api/desk_configuration/desk_configuration.controller.js b/server/api/desk_configuration/desk_configuration.controller.js
index aa98834..3824ca1 100644
--- a/server/api/desk_configuration/desk_configuration.controller.js
+++ b/server/api/desk_configuration/desk_configuration.controller.js
@@ -43,7 +43,7 @@ function handleEntityNotFound(res) {
 function saveUpdates(updates) {
   return function(entity) {
     return entity.updateAttributes(updates)
-      .then(updated => {
+      .then(function(updated) {
         return updated;
       });
   };
@@ -53,7 +53,7 @@ function removeEntity(res) {
   return function(entity) {
     if (entity) {
       return entity.destroy()
-        .then(() => {
+        .then(function() {
           res.status(204).end();
         });
     }
diff --git a/server/api/desk_field/desk_field.controller.js b/server/api/desk_field/desk_field.controller.js
index e983e1f..6b39f83 100644
--- a/server/api/desk_field/desk_field.controller.js
+++ b/server/api/desk_field/desk_field.controller.js
@@ -44,7 +44,7 @@ function handleEntityNotFound(res) {
 function saveUpdates(updates) {
   return function(entity) {
     return entity.updateAttributes(updates)
-      .then(updated => {
+      .then(function(updated) {
         return updated;
       });
   };
@@ -54,7 +54,7 @@ function removeEntity(res) {
   return function(entity) {
     if (entity) {
       return entity.destroy()
-        .then(() => {
+        .then(function() {
           res.status(204).end();
         });
     }
diff --git a/server/api/salesforce_account/salesforce_account.controller.js b/server/api/salesforce_account/salesforce_account.controller.js
index 1a76bb9..fcd48d4 100644
--- a/server/api/salesforce_account/salesforce_account.controller.js
+++ b/server/api/salesforce_account/salesforce_account.controller.js
@@ -46,7 +46,7 @@ function handleEntityNotFound(res) {
 function saveUpdates(updates) {
   return function(entity) {
     return entity.updateAttributes(updates)
-      .then(updated => {
+      .then(function(updated) {
         return updated;
       });
   };
@@ -56,7 +56,7 @@ function removeEntity(res) {
   return function(entity) {
     if (entity) {
       return entity.destroy()
-        .then(() => {
+        .then(function() {
           res.status(204).end();
         });
     }
diff --git a/server/api/salesforce_configuration/salesforce_configuration.controller.js b/server/api/salesforce_configuration/salesforce_configuration.controller.js
index d64e32c..3eaabd2 100644
--- a/server/api/salesforce_configuration/salesforce_configuration.controller.js
+++ b/server/api/salesforce_configuration/salesforce_configuration.controller.js
@@ -45,7 +45,7 @@ function handleEntityNotFound(res) {
 function saveUpdates(updates) {
   return function(entity) {
     return entity.updateAttributes(updates)
-      .then(updated => {
+      .then(function(updated) {
         return updated;
       });
   };
@@ -55,7 +55,7 @@ function removeEntity(res) {
   return function(entity) {
     if (entity) {
       return entity.destroy()
-        .then(() => {
+        .then(function() {
           res.status(204).end();
         });
     }
diff --git a/server/api/salesforce_field/salesforce_field.controller.js b/server/api/salesforce_field/salesforce_field.controller.js
index e206944..bab61d7 100644
--- a/server/api/salesforce_field/salesforce_field.controller.js
+++ b/server/api/salesforce_field/salesforce_field.controller.js
@@ -44,7 +44,7 @@ function handleEntityNotFound(res) {
 function saveUpdates(updates) {
   return function(entity) {
     return entity.updateAttributes(updates)
-      .then(updated => {
+      .then(function(updated) {
         return updated;
       });
   };
@@ -54,7 +54,7 @@ function removeEntity(res) {
   return function(entity) {
     if (entity) {
       return entity.destroy()
-        .then(() => {
+        .then(function() {
           res.status(204).end();
         });
     }
-- 
1.7.1