PM-4259 Al momento de asignar usuarios presenta un error

c Changed restler library to the RC4 which doesn't have the problem of the validation.
c Restored colosa composer repository
c Restored jquery and underscore dependencies like in the original composer.json
This commit is contained in:
caleeli
2015-12-01 13:01:46 -04:00
parent fbc839b9f9
commit d72935b21a
2 changed files with 695 additions and 220 deletions

View File

@@ -22,15 +22,23 @@
{ {
"type": "git", "type": "git",
"url": "git@bitbucket.org:colosa/pmui.git" "url": "git@bitbucket.org:colosa/pmui.git"
},
{
"type": "composer",
"url": "http://composer-public.colosa.net/"
},
{
"type": "composer",
"url": "http://composer.colosa.net/"
} }
], ],
"minimum-stability": "dev", "minimum-stability": "dev",
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"luracast/restler": "3.0.0", "luracast/restler": "3.0.0-RC4",
"bshaffer/oauth2-server-php": "v1.0", "bshaffer/oauth2-server-php": "v1.0",
"components/jquery": "1.10.2", "jquery/jquery": "1.10.2",
"components/underscore": "1.5.2", "underscore/underscore": "1.5.2",
"colosa/pmUI": "3.0.1.7-dev", "colosa/pmUI": "3.0.1.7-dev",
"colosa/MichelangeloFE": "3.0.1.7-dev", "colosa/MichelangeloFE": "3.0.1.7-dev",
"colosa/pmdynaform": "3.0.1.7-dev", "colosa/pmdynaform": "3.0.1.7-dev",

901
composer.lock generated

File diff suppressed because it is too large Load Diff