From 807aecec7b31b9107b642fbd827346c2d1aaa0ca Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Mon, 30 Jun 2014 11:59:58 -0400
Subject: [PATCH 1/4] BUG_15194: Error inserting data to PM Table.

The Json has some quotes that was causing troubles, because the stripslashes() function was been applicated before json_decode, so it was been applied twice.

Removing stripslashes() function, this is already added in json_decode().
---
 workflow/engine/controllers/pmTablesProxy.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workflow/engine/controllers/pmTablesProxy.php b/workflow/engine/controllers/pmTablesProxy.php
index 0364b4d0c..945874bdc 100755
--- a/workflow/engine/controllers/pmTablesProxy.php
+++ b/workflow/engine/controllers/pmTablesProxy.php
@@ -549,7 +549,7 @@ class pmTablesProxy extends HttpProxyController
 
         require_once $sPath . $this->className . '.php';
 
-        $rows = G::json_decode( stripslashes( $httpData->rows ) );
+        $rows = G::json_decode( $httpData->rows );
 
         if (is_array( $rows )) {
             foreach ($rows as $row) {

From f584f5cf23a1ab72197f12ce3ec2f28bc505b955 Mon Sep 17 00:00:00 2001
From: Erik Amaru Ortiz <aortiz.erik@gmail.com>
Date: Mon, 30 Jun 2014 17:06:21 -0400
Subject: [PATCH 2/4] update RestContext in saveExportedProcessTo() ...

---
 features/bootstrap/RestContext.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/bootstrap/RestContext.php b/features/bootstrap/RestContext.php
index c97378b79..2245cde44 100644
--- a/features/bootstrap/RestContext.php
+++ b/features/bootstrap/RestContext.php
@@ -1629,7 +1629,7 @@ class RestContext extends BehatContext
      */
     public function saveExportedProcessTo($destinationFolder, $exportedProcessFileName="")
     {
-        
+
         if($exportedProcessFileName == ""){//Obtain name from XML
             $exportedProcessFileName=$this->_data->xpath('//metadata/meta[@key="name"]');
             $exportedProcessFileName = $exportedProcessFileName[0];
@@ -1643,7 +1643,7 @@ class RestContext extends BehatContext
         $this->printDebug("Exporting process to: $exportedProcessFileName");
 
         file_put_contents($exportedProcessFileName, $this->_response->getBody(true));
-
+        chmod($exportedProcessFileName, 0777);
 
 
     }

From b1aa771c3759bbc7d6946f30396eabca5a0b0544 Mon Sep 17 00:00:00 2001
From: Erik Amaru Ortiz <aortiz.erik@gmail.com>
Date: Mon, 30 Jun 2014 17:38:48 -0400
Subject: [PATCH 3/4] updating neoclasic stylesheet, adding left padding to pm
 main logo

---
 workflow/engine/skinEngine/neoclassic/css/style.css | 4 ++++
 workflow/engine/skinEngine/neoclassic/layout.html   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/workflow/engine/skinEngine/neoclassic/css/style.css b/workflow/engine/skinEngine/neoclassic/css/style.css
index 4449724e7..5d39a0fec 100644
--- a/workflow/engine/skinEngine/neoclassic/css/style.css
+++ b/workflow/engine/skinEngine/neoclassic/css/style.css
@@ -3458,3 +3458,7 @@ button.x-btn-text:focus,
   /* Safari, Chrome */
 
 }
+
+.logo_company {
+    padding-left: 10px;
+}
\ No newline at end of file
diff --git a/workflow/engine/skinEngine/neoclassic/layout.html b/workflow/engine/skinEngine/neoclassic/layout.html
index ca92a94d7..0b99c7f99 100644
--- a/workflow/engine/skinEngine/neoclassic/layout.html
+++ b/workflow/engine/skinEngine/neoclassic/layout.html
@@ -12,7 +12,7 @@
           <table width="100%" height="32" border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF">
             <tr>
                 {if $user_logged neq '' or $tracker neq ''}
-                <td width="50%" rowspan="2" valign="center"><img src="{$logo_company}"/></td>
+                <td width="50%" rowspan="2" valign="center"><img src="{$logo_company}" class="logo_company"/></td>
                 <td width="50%" height="16" align="right" valign="top">
                   <div align="right" class="logout">
                     <small>

From 26915cf8ecbe7106ead32e188bd245b1d963b33d Mon Sep 17 00:00:00 2001
From: Erik Amaru Ortiz <aortiz.erik@gmail.com>
Date: Mon, 30 Jun 2014 18:48:04 -0400
Subject: [PATCH 4/4] disabling temporally pdepend task on default build
 execution for jenkins

---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 0600e1fbe..5ea8ae249 100644
--- a/build.xml
+++ b/build.xml
@@ -2,7 +2,7 @@
 
 <project name="ProcessMaker Michelangelo" default="build-phpcs">
     <target name="build"
-        depends="prepare,lint,phploc,pdepend,phpcs-ci,phpunit,phpdox,behat"/>
+        depends="prepare,lint,phploc,phpcs-ci,phpunit,phpdox,behat"/>
 
     <target name="build-simple"
         depends="prepare,phpunit,phpcs-ci,phploc,lint"/>