fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Victor Saisa Lopez
2013-11-28 14:18:08 -04:00
parent 177e50ca39 b6220b04c9
commit 50996a4d18
2 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build-vendor.php
View File

@@ -27,8 +27,7 @@ if (! is_dir($vendorDir )) {
$projects = array( $projects = array(
'colosa/michelangelofe', 'colosa/michelangelofe',
'colosa/pmui', 'colosa/pmui'
'colosa/restclient'
); );
echo PHP_EOL; echo PHP_EOL;
@@ -62,6 +61,9 @@ if (! is_dir($destinationDir.'/js')) {
if (! is_dir($destinationDir.'/css')) { if (! is_dir($destinationDir.'/css')) {
mkdir($destinationDir.'/css', 0777); mkdir($destinationDir.'/css', 0777);
} }
if (! is_dir($destinationDir.'/img')) {
mkdir($destinationDir.'/img', 0777);
}
if (! is_dir($destinationDir.'/mafe')) { if (! is_dir($destinationDir.'/mafe')) {
mkdir($destinationDir.'/mafe', 0777); 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/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/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 // michelangelofe
"colosa/michelangelofe/lib/wz_jsgraphics/wz_jsgraphics.js" => "js/wz_jsgraphics.js", "colosa/michelangelofe/lib/wz_jsgraphics/wz_jsgraphics.js" => "js/wz_jsgraphics.js",

13
composer.json
View File

@@ -51,18 +51,6 @@
"reference": "origin/master" "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", "jquery/jquery": "1.10.2",
"colosa/pmui": "dev-master", "colosa/pmui": "dev-master",
"colosa/michelangelofe": "dev-master", "colosa/michelangelofe": "dev-master",
"colosa/restclient": "dev-master",
"underscore/underscore": "1.5.2" "underscore/underscore": "1.5.2"
} }
} }