Merge branch 'master' of bitbucket.org:colosa/processmaker

build-vendor.php

@@ -27,8 +27,7 @@ if (! is_dir($vendorDir )) {
 
 $projects = array(
     'colosa/michelangelofe',
-    'colosa/pmui',
-    'colosa/restclient'
+    'colosa/pmui'
 );
 
 echo PHP_EOL;
@@ -62,6 +61,9 @@ if (! is_dir($destinationDir.'/js')) {
 if (! is_dir($destinationDir.'/css')) {
     mkdir($destinationDir.'/css', 0777);
 }
+if (! is_dir($destinationDir.'/img')) {
+    mkdir($destinationDir.'/img', 0777);
+}
 if (! is_dir($destinationDir.'/mafe')) {
     mkdir($destinationDir.'/mafe', 0777);
 }
@@ -79,7 +81,7 @@ $filesCollection = array(
     "colosa/michelangelo-fe-libs/jQueryUI/jquery-ui-1.10.3.custom.min.css" => "js/jquery-ui-1.10.3.custom.min.css",
     "colosa/michelangelo-fe-libs/wz_jsgraphics/wz_jsgraphics.js" => "js/wz_jsgraphics.js",*/    
 
-    "colosa/restclient/restclient-min.js" => "js/restclient-min.js",
+    "colosa/pmui/libraries/restclient/restclient-min.js" => "js/restclient-min.js",
     
     // michelangelofe
     "colosa/michelangelofe/lib/wz_jsgraphics/wz_jsgraphics.js" => "js/wz_jsgraphics.js",

composer.json

@@ -51,18 +51,6 @@
                     "reference": "origin/master"
                 }
             }
-        },
-        {
-            "type": "package",
-            "package": {
-                "name": "colosa/restclient",
-                "version": "dev-master",
-                "source": {
-                    "url": "git@github.com:colosa/restclient.git",
-                    "type": "git",
-                    "reference": "origin/master"
-                }
-            }
         }
     ],
     
@@ -72,7 +60,6 @@
         "jquery/jquery": "1.10.2",
         "colosa/pmui": "dev-master",
         "colosa/michelangelofe": "dev-master",
-        "colosa/restclient": "dev-master",
         "underscore/underscore": "1.5.2"
     }
 }