Merged in bugfix/HOR-3618 (pull request #5858)

HOR-3618

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
This commit is contained in:
Paula Quispe
2017-08-04 21:14:58 +00:00
2 changed files with 34 additions and 80 deletions

View File

@@ -36,7 +36,6 @@
"dapphp/securimage": "^3.6", "dapphp/securimage": "^3.6",
"psr/log":"1.0.0", "psr/log":"1.0.0",
"monolog/monolog": "1.19.0", "monolog/monolog": "1.19.0",
"ezyang/htmlpurifier": "4.8.0",
"geshi/geshi": "dev-master", "geshi/geshi": "dev-master",
"libchart/libchart": "1.4.0", "libchart/libchart": "1.4.0",
"indeyets/pake": "1.99.*", "indeyets/pake": "1.99.*",

113
composer.lock generated
View File

@@ -4,8 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "a1e42b4c6d3e8a5c67a43b9022973a66", "content-hash": "b1965af4146852b5ea1aba13a19df7b6",
"content-hash": "9fed6081049070197591b4a9f96f5dcb",
"packages": [ "packages": [
{ {
"name": "bshaffer/oauth2-server-php", "name": "bshaffer/oauth2-server-php",
@@ -30,7 +29,7 @@
"OAuth2": "src/" "OAuth2": "src/"
} }
}, },
"notification-url": "http://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"MIT" "MIT"
], ],
@@ -48,7 +47,7 @@
"oauth", "oauth",
"oauth2" "oauth2"
], ],
"time": "2013-08-12 16:35:58" "time": "2013-08-12T16:35:58+00:00"
}, },
{ {
"name": "colosa/MichelangeloFE", "name": "colosa/MichelangeloFE",
@@ -146,51 +145,7 @@
"captcha", "captcha",
"security" "security"
], ],
"time": "2016-12-04 17:45:57" "time": "2016-12-04T17:45:57+00:00"
},
{
"name": "ezyang/htmlpurifier",
"version": "v4.8.0",
"source": {
"type": "git",
"url": "https://github.com/ezyang/htmlpurifier.git",
"reference": "d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2",
"reference": "d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2",
"shasum": ""
},
"require": {
"php": ">=5.2"
},
"type": "library",
"autoload": {
"psr-0": {
"HTMLPurifier": "library/"
},
"files": [
"library/HTMLPurifier.composer.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"LGPL"
],
"authors": [
{
"name": "Edward Z. Yang",
"email": "admin@htmlpurifier.org",
"homepage": "http://ezyang.com"
}
],
"description": "Standards compliant HTML filter written in PHP",
"homepage": "http://htmlpurifier.org/",
"keywords": [
"html"
],
"time": "2016-07-16 12:58:58"
}, },
{ {
"name": "geshi/geshi", "name": "geshi/geshi",
@@ -264,7 +219,7 @@
"src/" "src/"
] ]
}, },
"notification-url": "http://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"Apache-2.0" "Apache-2.0"
], ],
@@ -273,7 +228,7 @@
"keywords": [ "keywords": [
"google" "google"
], ],
"time": "2015-10-16 22:11:08" "time": "2015-10-16T22:11:08+00:00"
}, },
{ {
"name": "indeyets/pake", "name": "indeyets/pake",
@@ -339,7 +294,7 @@
"build", "build",
"task" "task"
], ],
"time": "2013-11-04 08:29:46" "time": "2013-11-04T08:29:46+00:00"
}, },
{ {
"name": "libchart/libchart", "name": "libchart/libchart",
@@ -385,7 +340,7 @@
"line charts", "line charts",
"pie charts" "pie charts"
], ],
"time": "2013-10-19 22:21:30" "time": "2013-10-19T22:21:30+00:00"
}, },
{ {
"name": "luracast/restler", "name": "luracast/restler",
@@ -464,7 +419,7 @@
"rest", "rest",
"server" "server"
], ],
"time": "2017-01-11 03:42:36" "time": "2017-01-11T03:42:36+00:00"
}, },
{ {
"name": "monolog/monolog", "name": "monolog/monolog",
@@ -542,7 +497,7 @@
"logging", "logging",
"psr-3" "psr-3"
], ],
"time": "2016-04-12 18:29:35" "time": "2016-04-12T18:29:35+00:00"
}, },
{ {
"name": "pear/archive_tar", "name": "pear/archive_tar",
@@ -608,7 +563,7 @@
"archive", "archive",
"tar" "tar"
], ],
"time": "2017-06-11 17:28:11" "time": "2017-06-11T17:28:11+00:00"
}, },
{ {
"name": "pear/console_getopt", "name": "pear/console_getopt",
@@ -655,7 +610,7 @@
} }
], ],
"description": "More info available on: http://pear.php.net/package/Console_Getopt", "description": "More info available on: http://pear.php.net/package/Console_Getopt",
"time": "2015-07-20 20:28:12" "time": "2015-07-20T20:28:12+00:00"
}, },
{ {
"name": "pear/pear-core-minimal", "name": "pear/pear-core-minimal",
@@ -699,7 +654,7 @@
} }
], ],
"description": "Minimal set of PEAR core files to be used as composer dependency", "description": "Minimal set of PEAR core files to be used as composer dependency",
"time": "2017-02-28 16:46:11" "time": "2017-02-28T16:46:11+00:00"
}, },
{ {
"name": "pear/pear_exception", "name": "pear/pear_exception",
@@ -754,7 +709,7 @@
"keywords": [ "keywords": [
"exception" "exception"
], ],
"time": "2015-02-10 20:07:52" "time": "2015-02-10T20:07:52+00:00"
}, },
{ {
"name": "phpmailer/phpmailer", "name": "phpmailer/phpmailer",
@@ -831,7 +786,7 @@
} }
], ],
"description": "PHPMailer is a full-featured email creation and transfer class for PHP", "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
"time": "2017-07-26 21:00:20" "time": "2017-07-26T21:00:20+00:00"
}, },
{ {
"name": "psr/log", "name": "psr/log",
@@ -869,7 +824,7 @@
"psr", "psr",
"psr-3" "psr-3"
], ],
"time": "2012-12-21 11:40:51" "time": "2012-12-21T11:40:51+00:00"
}, },
{ {
"name": "tecnickcom/tcpdf", "name": "tecnickcom/tcpdf",
@@ -931,7 +886,7 @@
"pdf417", "pdf417",
"qrcode" "qrcode"
], ],
"time": "2017-04-26 08:14:48" "time": "2017-04-26T08:14:48+00:00"
} }
], ],
"packages-dev": [ "packages-dev": [
@@ -982,7 +937,7 @@
"Behat\\Behat": "src/" "Behat\\Behat": "src/"
} }
}, },
"notification-url": "http://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"MIT" "MIT"
], ],
@@ -1000,7 +955,7 @@
"Behat", "Behat",
"Symfony2" "Symfony2"
], ],
"time": "2013-06-06 10:46:48" "time": "2013-06-06T10:46:48+00:00"
}, },
{ {
"name": "behat/gherkin", "name": "behat/gherkin",
@@ -1041,7 +996,7 @@
"Behat\\Gherkin": "src/" "Behat\\Gherkin": "src/"
} }
}, },
"notification-url": "http://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"MIT" "MIT"
], ],
@@ -1061,7 +1016,7 @@
"Symfony2", "Symfony2",
"parser" "parser"
], ],
"time": "2013-03-02 10:38:40" "time": "2013-03-02T10:38:40+00:00"
}, },
{ {
"name": "guzzle/guzzle", "name": "guzzle/guzzle",
@@ -1127,7 +1082,7 @@
"Guzzle": "src/" "Guzzle": "src/"
} }
}, },
"notification-url": "http://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"MIT" "MIT"
], ],
@@ -1154,7 +1109,7 @@
"web service" "web service"
], ],
"abandoned": "guzzlehttp/guzzle", "abandoned": "guzzlehttp/guzzle",
"time": "2013-01-28 00:07:40" "time": "2013-01-28T00:07:40+00:00"
}, },
{ {
"name": "symfony/config", "name": "symfony/config",
@@ -1210,7 +1165,7 @@
], ],
"description": "Symfony Config Component", "description": "Symfony Config Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-04-12 14:07:15" "time": "2017-04-12T14:07:15+00:00"
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
@@ -1271,7 +1226,7 @@
], ],
"description": "Symfony Console Component", "description": "Symfony Console Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-07-29 21:26:04" "time": "2017-07-29T21:26:04+00:00"
}, },
{ {
"name": "symfony/debug", "name": "symfony/debug",
@@ -1328,7 +1283,7 @@
], ],
"description": "Symfony Debug Component", "description": "Symfony Debug Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-07-30 07:22:48" "time": "2016-07-30T07:22:48+00:00"
}, },
{ {
"name": "symfony/dependency-injection", "name": "symfony/dependency-injection",
@@ -1391,7 +1346,7 @@
], ],
"description": "Symfony DependencyInjection Component", "description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-07-28 15:21:22" "time": "2017-07-28T15:21:22+00:00"
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
@@ -1451,7 +1406,7 @@
], ],
"description": "Symfony EventDispatcher Component", "description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-06-02 07:47:27" "time": "2017-06-02T07:47:27+00:00"
}, },
{ {
"name": "symfony/filesystem", "name": "symfony/filesystem",
@@ -1500,7 +1455,7 @@
], ],
"description": "Symfony Filesystem Component", "description": "Symfony Filesystem Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-07-20 05:43:46" "time": "2016-07-20T05:43:46+00:00"
}, },
{ {
"name": "symfony/finder", "name": "symfony/finder",
@@ -1534,7 +1489,7 @@
"/Tests/" "/Tests/"
] ]
}, },
"notification-url": "http://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"MIT" "MIT"
], ],
@@ -1550,7 +1505,7 @@
], ],
"description": "Symfony Finder Component", "description": "Symfony Finder Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-05-13 14:58:35" "time": "2016-05-13T14:58:35+00:00"
}, },
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
@@ -1609,7 +1564,7 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2017-06-09 14:24:12" "time": "2017-06-09T14:24:12+00:00"
}, },
{ {
"name": "symfony/translation", "name": "symfony/translation",
@@ -1673,7 +1628,7 @@
], ],
"description": "Symfony Translation Component", "description": "Symfony Translation Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-06-24 16:44:49" "time": "2017-06-24T16:44:49+00:00"
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
@@ -1722,7 +1677,7 @@
], ],
"description": "Symfony Yaml Component", "description": "Symfony Yaml Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-06-01 20:52:29" "time": "2017-06-01T20:52:29+00:00"
} }
], ],
"aliases": [], "aliases": [],