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

This commit is contained in:
Wendy Nestor
2014-01-30 09:39:12 -04:00

View File

@@ -2,52 +2,34 @@
"name": "processmaker/processmaker",
"description": "BPM PHP Software",
"keywords": ["php bpm processmaker"],
"homepage": "http://processmaker.com",
"license": "GNU Affero General Public License version 3",
"homepage": "http://www.processmaker.com",
"license": "AGPL-3.0",
"repositories": [
{
"type": "package",
"package": {
"name": "jquery/jquery",
"version": "1.10.2",
"dist": {
"url": "http://code.jquery.com/jquery-1.10.2.min.js",
"type": "file"
}
}
"packagist": false
},
{
"type": "package",
"package": {
"name": "underscore/underscore",
"version": "1.5.2",
"dist": {
"url": "http://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.5.2/underscore-min.js",
"type": "file"
}
}
"type": "composer",
"url": "http://composer-public.colosa.net/"
},
{
"type": "vcs",
"url": "git@bitbucket.org:colosa/pmUI.git"
},
{
"type": "vcs",
"url": "git@bitbucket.org:colosa/MichelangeloFE.git"
"type": "composer",
"url": "http://composer.colosa.net/"
}
],
"require": {
"php":">=5.3.3",
"underscore/underscore": "1.5.2",
"jquery/jquery": "1.10.2",
"luracast/restler" : "v3.0.0",
"bshaffer/oauth2-server-php": "v1.0",
"jquery/jquery": "1.10.2",
"underscore/underscore": "1.5.2",
"colosa/restclient": "0.1.7",
"colosa/pmUI": "dev-master",
"colosa/MichelangeloFE": "dev-master"
},
"require-dev":{
"guzzle/guzzle":"~3.1.1",
"behat/behat":"2.4.*@stable"
"behat/behat":"2.4.6@stable"
}
}