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

Merged in bugfix/HOR-4521-B (pull request #6455)

Browse Source 
HOR-4521

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
This commit is contained in:
Julio Cesar Laura Avendaño
2018-05-03 12:12:29 +00:00
parent 36e0a362b0 c9cdcc3f51
commit d2d5b9454e
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
composer.json
View File

@@ -30,9 +30,9 @@
"laravel/framework": "5.4.*", "laravel/framework": "5.4.*",
"luracast/restler": "^3.0", "luracast/restler": "^3.0",
"bshaffer/oauth2-server-php": "v1.0", "bshaffer/oauth2-server-php": "v1.0",
"colosa/pmUI": "release/3.2.2-dev", "colosa/pmUI": "release/3.2.3-dev",
"colosa/MichelangeloFE": "release/3.2.2-dev", "colosa/MichelangeloFE": "release/3.2.3-dev",
"colosa/pmdynaform": "release/3.2.2-dev", "colosa/pmdynaform": "release/3.2.3-dev",
"google/apiclient": "1.1.6", "google/apiclient": "1.1.6",
"dapphp/securimage": "^3.6", "dapphp/securimage": "^3.6",
"psr/log":"1.0.0", "psr/log":"1.0.0",

20
composer.lock generated
View File

@@ -51,14 +51,14 @@
}, },
{ {
"name": "colosa/MichelangeloFE", "name": "colosa/MichelangeloFE",
"version": "dev-release/3.2.2", "version": "dev-release/3.2.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "git@bitbucket.org:colosa/michelangelofe.git", "url": "git@bitbucket.org:colosa/michelangelofe.git",
"reference": "8ae8cc428412d8c964bc657b2d87ca7ea0194d15" "reference": "a44fbc3e9d0c9c1ce1f0e7697cedc809f8a3a220"
}, },
"require": { "require": {
"colosa/pmui": "release/3.2.2-dev" "colosa/pmui": "release/3.2.3-dev"
}, },
"type": "library", "type": "library",
"description": "ProcessMaker Michelangelo Front End", "description": "ProcessMaker Michelangelo Front End",
@@ -66,15 +66,15 @@
"keywords": [ "keywords": [
"js app ProcessMaker" "js app ProcessMaker"
], ],
"time": "2018-01-27T00:51:59+00:00" "time": "2018-04-27T20:10:38+00:00"
}, },
{ {
"name": "colosa/pmDynaform", "name": "colosa/pmDynaform",
"version": "dev-release/3.2.2", "version": "dev-release/3.2.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "git@bitbucket.org:colosa/pmdynaform.git", "url": "git@bitbucket.org:colosa/pmdynaform.git",
"reference": "fc2c73afeb721da2c0ddfc15d4ce892049938f4b" "reference": "fa6a9eb4520a090aaf50e46c90e49596b0794f04"
}, },
"type": "library", "type": "library",
"description": "JS Library to render ProcessMaker Dynaforms", "description": "JS Library to render ProcessMaker Dynaforms",
@@ -82,15 +82,15 @@
"keywords": [ "keywords": [
"js lib ProcessMaker Dynaforms" "js lib ProcessMaker Dynaforms"
], ],
"time": "2017-11-30T19:21:05+00:00" "time": "2018-04-16T15:41:04+00:00"
}, },
{ {
"name": "colosa/pmUI", "name": "colosa/pmUI",
"version": "dev-release/3.2.2", "version": "dev-release/3.2.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "git@bitbucket.org:colosa/pmui.git", "url": "git@bitbucket.org:colosa/pmui.git",
"reference": "1f25446c547ac61042661f191ea4647ad25ab11d" "reference": "583402fdb1a5da606d02cc25f4a5573c3ff800b2"
}, },
"type": "library", "type": "library",
"description": "JS UI Library", "description": "JS UI Library",
@@ -98,7 +98,7 @@
"keywords": [ "keywords": [
"js lib ProcessMaker UI" "js lib ProcessMaker UI"
], ],
"time": "2017-10-17T17:56:43+00:00" "time": "2018-04-19T20:17:00+00:00"
}, },
{ {
"name": "dapphp/securimage", "name": "dapphp/securimage",