diff --git a/build.xml b/build.xml index 0600e1fbe..5ea8ae249 100644 --- a/build.xml +++ b/build.xml @@ -2,7 +2,7 @@ + depends="prepare,lint,phploc,phpcs-ci,phpunit,phpdox,behat"/> 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); } diff --git a/workflow/engine/controllers/pmTablesProxy.php b/workflow/engine/controllers/pmTablesProxy.php index c7be5b04b..76d841752 100755 --- a/workflow/engine/controllers/pmTablesProxy.php +++ b/workflow/engine/controllers/pmTablesProxy.php @@ -551,7 +551,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) { 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 @@ {if $user_logged neq '' or $tracker neq ''} - +