Update several dependencies (frontend & backend) (#571)
Closes #568. Updates Composer packages No longer supporting outdated PHP Versions, Update Dome Frontend assets, fix php notices and warnings popping Up when run in debug Mode...
This commit is contained in:
parent
9d30b9854c
commit
1bd14995fb
|
@ -2,29 +2,24 @@
|
||||||
"name": "phpservermon/phpservermon",
|
"name": "phpservermon/phpservermon",
|
||||||
"description": "PHP Server Monitor",
|
"description": "PHP Server Monitor",
|
||||||
"homepage": "http://www.phpservermonitor.org",
|
"homepage": "http://www.phpservermonitor.org",
|
||||||
"repositories": [
|
|
||||||
|
|
||||||
],
|
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.3.7",
|
"php": ">=5.5.9",
|
||||||
"phpmailer/phpmailer": "5.2.6",
|
"phpmailer/phpmailer": "~6.0",
|
||||||
"symfony/config": "2.8.*",
|
"symfony/config": "~3.4",
|
||||||
"symfony/dependency-injection": "2.8.*",
|
"symfony/dependency-injection": "~3.4",
|
||||||
"symfony/event-dispatcher": "2.8.*",
|
"symfony/event-dispatcher": "~3.4",
|
||||||
"symfony/http-foundation": "2.8.*",
|
"symfony/http-foundation": "~3.4",
|
||||||
"php-pushover/php-pushover": "dev-master",
|
"php-pushover/php-pushover": "dev-master",
|
||||||
"twig/twig": "1.*",
|
"paragonie/random_compat": "^2.0",
|
||||||
"paragonie/random_compat" : "1.1.6",
|
"twig/twig": "~2.0"
|
||||||
"indigophp/hash-compat" : "1.1.0"
|
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"files": [
|
"files": [
|
||||||
"./src/includes/psmconfig.inc.php",
|
"./src/includes/psmconfig.inc.php",
|
||||||
"./src/includes/functions.inc.php",
|
"./src/includes/functions.inc.php"
|
||||||
"./src/includes/password_compatibility_library.inc.php"
|
|
||||||
],
|
],
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
"psm\\": "src/psm/"
|
"psm\\": "src/psm/"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -4,114 +4,20 @@
|
||||||
"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": "8f27400edd82e99aa35998a3e01fc23e",
|
"content-hash": "df73dfceb74094f39dd22995d84b9bb3",
|
||||||
"content-hash": "3d1c36ee7e11634bc149bfc9a250e4ae",
|
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
|
||||||
"name": "indigophp/hash-compat",
|
|
||||||
"version": "v1.1.0",
|
|
||||||
"source": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/indigophp/hash-compat.git",
|
|
||||||
"reference": "43a19f42093a0cd2d11874dff9d891027fc42214"
|
|
||||||
},
|
|
||||||
"dist": {
|
|
||||||
"type": "zip",
|
|
||||||
"url": "https://api.github.com/repos/indigophp/hash-compat/zipball/43a19f42093a0cd2d11874dff9d891027fc42214",
|
|
||||||
"reference": "43a19f42093a0cd2d11874dff9d891027fc42214",
|
|
||||||
"shasum": ""
|
|
||||||
},
|
|
||||||
"require": {
|
|
||||||
"php": ">=5.3"
|
|
||||||
},
|
|
||||||
"require-dev": {
|
|
||||||
"phpunit/phpunit": "~4.4"
|
|
||||||
},
|
|
||||||
"type": "library",
|
|
||||||
"extra": {
|
|
||||||
"branch-alias": {
|
|
||||||
"dev-master": "1.2-dev"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"autoload": {
|
|
||||||
"files": [
|
|
||||||
"src/hash_equals.php",
|
|
||||||
"src/hash_pbkdf2.php"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
|
||||||
"license": [
|
|
||||||
"MIT"
|
|
||||||
],
|
|
||||||
"authors": [
|
|
||||||
{
|
|
||||||
"name": "Márk Sági-Kazár",
|
|
||||||
"email": "mark.sagikazar@gmail.com"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "Backports hash_* functionality to older PHP versions",
|
|
||||||
"homepage": "https://indigophp.com",
|
|
||||||
"keywords": [
|
|
||||||
"hash",
|
|
||||||
"hash_equals",
|
|
||||||
"hash_pbkdf2"
|
|
||||||
],
|
|
||||||
"time": "2015-08-22 07:03:35"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "ircmaxell/password-compat",
|
|
||||||
"version": "v1.0.4",
|
|
||||||
"source": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/ircmaxell/password_compat.git",
|
|
||||||
"reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c"
|
|
||||||
},
|
|
||||||
"dist": {
|
|
||||||
"type": "zip",
|
|
||||||
"url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c",
|
|
||||||
"reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c",
|
|
||||||
"shasum": ""
|
|
||||||
},
|
|
||||||
"require-dev": {
|
|
||||||
"phpunit/phpunit": "4.*"
|
|
||||||
},
|
|
||||||
"type": "library",
|
|
||||||
"autoload": {
|
|
||||||
"files": [
|
|
||||||
"lib/password.php"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
|
||||||
"license": [
|
|
||||||
"MIT"
|
|
||||||
],
|
|
||||||
"authors": [
|
|
||||||
{
|
|
||||||
"name": "Anthony Ferrara",
|
|
||||||
"email": "ircmaxell@php.net",
|
|
||||||
"homepage": "http://blog.ircmaxell.com"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash",
|
|
||||||
"homepage": "https://github.com/ircmaxell/password_compat",
|
|
||||||
"keywords": [
|
|
||||||
"hashing",
|
|
||||||
"password"
|
|
||||||
],
|
|
||||||
"time": "2014-11-20 16:49:30"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "paragonie/random_compat",
|
"name": "paragonie/random_compat",
|
||||||
"version": "1.1.6",
|
"version": "v2.0.11",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/paragonie/random_compat.git",
|
"url": "https://github.com/paragonie/random_compat.git",
|
||||||
"reference": "e6f80ab77885151908d0ec743689ca700886e8b0"
|
"reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/e6f80ab77885151908d0ec743689ca700886e8b0",
|
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/5da4d3c796c275c55f057af5a643ae297d96b4d8",
|
||||||
"reference": "e6f80ab77885151908d0ec743689ca700886e8b0",
|
"reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -146,20 +52,20 @@
|
||||||
"pseudorandom",
|
"pseudorandom",
|
||||||
"random"
|
"random"
|
||||||
],
|
],
|
||||||
"time": "2016-01-29 16:19:52"
|
"time": "2017-09-27T21:40:39+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "php-pushover/php-pushover",
|
"name": "php-pushover/php-pushover",
|
||||||
"version": "dev-master",
|
"version": "dev-master",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/phpservermon/php-pushover.git",
|
"url": "https://github.com/cschalenborgh/php-pushover.git",
|
||||||
"reference": "d13d08dbf5f1cfa73f4adca7e8d27f79c804dd7b"
|
"reference": "620df1c6cf53061286ecde80e96bb402f2713c22"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/phpservermon/php-pushover/zipball/d13d08dbf5f1cfa73f4adca7e8d27f79c804dd7b",
|
"url": "https://api.github.com/repos/cschalenborgh/php-pushover/zipball/620df1c6cf53061286ecde80e96bb402f2713c22",
|
||||||
"reference": "d13d08dbf5f1cfa73f4adca7e8d27f79c804dd7b",
|
"reference": "620df1c6cf53061286ecde80e96bb402f2713c22",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
|
@ -168,40 +74,57 @@
|
||||||
"Pushover.php"
|
"Pushover.php"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Chris Schalenborgh",
|
||||||
|
"email": "chris@schalenborgh.be"
|
||||||
|
}
|
||||||
|
],
|
||||||
"description": "PHP class for the Pushover.net project",
|
"description": "PHP class for the Pushover.net project",
|
||||||
"support": {
|
"time": "2017-08-29T22:04:56+00:00"
|
||||||
"source": "https://github.com/phpservermon/php-pushover/tree/master"
|
|
||||||
},
|
|
||||||
"time": "2014-07-30 13:55:53"
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpmailer/phpmailer",
|
"name": "phpmailer/phpmailer",
|
||||||
"version": "v5.2.6",
|
"version": "v6.0.5",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/PHPMailer/PHPMailer.git",
|
"url": "https://github.com/PHPMailer/PHPMailer.git",
|
||||||
"reference": "4d9434e394496a5bb7acd9e73046587184b413df"
|
"reference": "cb3ea134d4d3729e7857737d5f320cce9caf4d32"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/4d9434e394496a5bb7acd9e73046587184b413df",
|
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/cb3ea134d4d3729e7857737d5f320cce9caf4d32",
|
||||||
"reference": "4d9434e394496a5bb7acd9e73046587184b413df",
|
"reference": "cb3ea134d4d3729e7857737d5f320cce9caf4d32",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.0.0"
|
"ext-ctype": "*",
|
||||||
|
"ext-filter": "*",
|
||||||
|
"php": ">=5.5.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpdocumentor/phpdocumentor": "*",
|
"doctrine/annotations": "1.2.*",
|
||||||
"phpunit/phpunit": "*"
|
"friendsofphp/php-cs-fixer": "^2.2",
|
||||||
|
"phpdocumentor/phpdocumentor": "2.*",
|
||||||
|
"phpunit/phpunit": "^4.8 || ^5.7",
|
||||||
|
"zendframework/zend-eventmanager": "3.0.*",
|
||||||
|
"zendframework/zend-i18n": "2.7.3",
|
||||||
|
"zendframework/zend-serializer": "2.7.*"
|
||||||
|
},
|
||||||
|
"suggest": {
|
||||||
|
"ext-mbstring": "Needed to send email in multibyte encoding charset",
|
||||||
|
"hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
|
||||||
|
"league/oauth2-google": "Needed for Google XOAUTH2 authentication",
|
||||||
|
"psr/log": "For optional PSR-3 debug logging",
|
||||||
|
"stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication",
|
||||||
|
"symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"classmap": [
|
"psr-4": {
|
||||||
"class.phpmailer.php",
|
"PHPMailer\\PHPMailer\\": "src/"
|
||||||
"class.pop3.php",
|
}
|
||||||
"class.smtp.php"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
"license": [
|
"license": [
|
||||||
|
@ -225,30 +148,92 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"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": "2013-04-11 16:45:39"
|
"time": "2018-03-27T13:49:45+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/config",
|
"name": "psr/container",
|
||||||
"version": "v2.8.2",
|
"version": "1.0.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/config.git",
|
"url": "https://github.com/php-fig/container.git",
|
||||||
"reference": "41ee6c70758f40fa1dbf90d019ae0a66c4a09e74"
|
"reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/config/zipball/41ee6c70758f40fa1dbf90d019ae0a66c4a09e74",
|
"url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
|
||||||
"reference": "41ee6c70758f40fa1dbf90d019ae0a66c4a09e74",
|
"reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.3.9",
|
"php": ">=5.3.0"
|
||||||
"symfony/filesystem": "~2.3|~3.0.0"
|
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "2.8-dev"
|
"dev-master": "1.0.x-dev"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"Psr\\Container\\": "src/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "PHP-FIG",
|
||||||
|
"homepage": "http://www.php-fig.org/"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Common Container Interface (PHP FIG PSR-11)",
|
||||||
|
"homepage": "https://github.com/php-fig/container",
|
||||||
|
"keywords": [
|
||||||
|
"PSR-11",
|
||||||
|
"container",
|
||||||
|
"container-interface",
|
||||||
|
"container-interop",
|
||||||
|
"psr"
|
||||||
|
],
|
||||||
|
"time": "2017-02-14T16:28:37+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "symfony/config",
|
||||||
|
"version": "v3.4.6",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/symfony/config.git",
|
||||||
|
"reference": "05e10567b529476a006b00746c5f538f1636810e"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/symfony/config/zipball/05e10567b529476a006b00746c5f538f1636810e",
|
||||||
|
"reference": "05e10567b529476a006b00746c5f538f1636810e",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": "^5.5.9|>=7.0.8",
|
||||||
|
"symfony/filesystem": "~2.8|~3.0|~4.0"
|
||||||
|
},
|
||||||
|
"conflict": {
|
||||||
|
"symfony/dependency-injection": "<3.3",
|
||||||
|
"symfony/finder": "<3.3"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"symfony/dependency-injection": "~3.3|~4.0",
|
||||||
|
"symfony/event-dispatcher": "~3.3|~4.0",
|
||||||
|
"symfony/finder": "~3.3|~4.0",
|
||||||
|
"symfony/yaml": "~3.0|~4.0"
|
||||||
|
},
|
||||||
|
"suggest": {
|
||||||
|
"symfony/yaml": "To use the yaml reference dumper"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"extra": {
|
||||||
|
"branch-alias": {
|
||||||
|
"dev-master": "3.4-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
@ -275,42 +260,51 @@
|
||||||
],
|
],
|
||||||
"description": "Symfony Config Component",
|
"description": "Symfony Config Component",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"time": "2016-01-03 15:33:41"
|
"time": "2018-02-14T10:03:57+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/dependency-injection",
|
"name": "symfony/dependency-injection",
|
||||||
"version": "v2.8.2",
|
"version": "v3.4.6",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/dependency-injection.git",
|
"url": "https://github.com/symfony/dependency-injection.git",
|
||||||
"reference": "ba94a914e244e0d05f0aaef460d5558d5541d2b1"
|
"reference": "12e901abc1cb0d637a0e5abe9923471361d96b07"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/ba94a914e244e0d05f0aaef460d5558d5541d2b1",
|
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/12e901abc1cb0d637a0e5abe9923471361d96b07",
|
||||||
"reference": "ba94a914e244e0d05f0aaef460d5558d5541d2b1",
|
"reference": "12e901abc1cb0d637a0e5abe9923471361d96b07",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.3.9"
|
"php": "^5.5.9|>=7.0.8",
|
||||||
|
"psr/container": "^1.0"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
"symfony/expression-language": "<2.6"
|
"symfony/config": "<3.3.7",
|
||||||
|
"symfony/finder": "<3.3",
|
||||||
|
"symfony/proxy-manager-bridge": "<3.4",
|
||||||
|
"symfony/yaml": "<3.4"
|
||||||
|
},
|
||||||
|
"provide": {
|
||||||
|
"psr/container-implementation": "1.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"symfony/config": "~2.2|~3.0.0",
|
"symfony/config": "~3.3|~4.0",
|
||||||
"symfony/expression-language": "~2.6|~3.0.0",
|
"symfony/expression-language": "~2.8|~3.0|~4.0",
|
||||||
"symfony/yaml": "~2.1|~3.0.0"
|
"symfony/yaml": "~3.4|~4.0"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"symfony/config": "",
|
"symfony/config": "",
|
||||||
|
"symfony/expression-language": "For using expressions in service container configuration",
|
||||||
|
"symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required",
|
||||||
"symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
|
"symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
|
||||||
"symfony/yaml": ""
|
"symfony/yaml": ""
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "2.8-dev"
|
"dev-master": "3.4-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
@ -337,31 +331,34 @@
|
||||||
],
|
],
|
||||||
"description": "Symfony DependencyInjection Component",
|
"description": "Symfony DependencyInjection Component",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"time": "2016-01-12 17:46:01"
|
"time": "2018-03-04T03:54:53+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/event-dispatcher",
|
"name": "symfony/event-dispatcher",
|
||||||
"version": "v2.8.2",
|
"version": "v3.4.6",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/event-dispatcher.git",
|
"url": "https://github.com/symfony/event-dispatcher.git",
|
||||||
"reference": "ee278f7c851533e58ca307f66305ccb9188aceda"
|
"reference": "58990682ac3fdc1f563b7e705452921372aad11d"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ee278f7c851533e58ca307f66305ccb9188aceda",
|
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/58990682ac3fdc1f563b7e705452921372aad11d",
|
||||||
"reference": "ee278f7c851533e58ca307f66305ccb9188aceda",
|
"reference": "58990682ac3fdc1f563b7e705452921372aad11d",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.3.9"
|
"php": "^5.5.9|>=7.0.8"
|
||||||
|
},
|
||||||
|
"conflict": {
|
||||||
|
"symfony/dependency-injection": "<3.3"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"psr/log": "~1.0",
|
"psr/log": "~1.0",
|
||||||
"symfony/config": "~2.0,>=2.0.5|~3.0.0",
|
"symfony/config": "~2.8|~3.0|~4.0",
|
||||||
"symfony/dependency-injection": "~2.6|~3.0.0",
|
"symfony/dependency-injection": "~3.3|~4.0",
|
||||||
"symfony/expression-language": "~2.6|~3.0.0",
|
"symfony/expression-language": "~2.8|~3.0|~4.0",
|
||||||
"symfony/stopwatch": "~2.3|~3.0.0"
|
"symfony/stopwatch": "~2.8|~3.0|~4.0"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"symfony/dependency-injection": "",
|
"symfony/dependency-injection": "",
|
||||||
|
@ -370,7 +367,7 @@
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "2.8-dev"
|
"dev-master": "3.4-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
@ -397,29 +394,29 @@
|
||||||
],
|
],
|
||||||
"description": "Symfony EventDispatcher Component",
|
"description": "Symfony EventDispatcher Component",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"time": "2016-01-13 10:28:07"
|
"time": "2018-02-14T10:03:57+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/filesystem",
|
"name": "symfony/filesystem",
|
||||||
"version": "v3.0.1",
|
"version": "v4.0.6",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/filesystem.git",
|
"url": "https://github.com/symfony/filesystem.git",
|
||||||
"reference": "c2e59d11dccd135dc8f00ee97f34fe1de842e70c"
|
"reference": "5d2d655b2c72fc4d9bf7e9bf14f72a447b940f21"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/filesystem/zipball/c2e59d11dccd135dc8f00ee97f34fe1de842e70c",
|
"url": "https://api.github.com/repos/symfony/filesystem/zipball/5d2d655b2c72fc4d9bf7e9bf14f72a447b940f21",
|
||||||
"reference": "c2e59d11dccd135dc8f00ee97f34fe1de842e70c",
|
"reference": "5d2d655b2c72fc4d9bf7e9bf14f72a447b940f21",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.5.9"
|
"php": "^7.1.3"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "3.0-dev"
|
"dev-master": "4.0-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
@ -446,34 +443,34 @@
|
||||||
],
|
],
|
||||||
"description": "Symfony Filesystem Component",
|
"description": "Symfony Filesystem Component",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"time": "2015-12-22 10:39:06"
|
"time": "2018-02-22T10:50:29+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/http-foundation",
|
"name": "symfony/http-foundation",
|
||||||
"version": "v2.8.2",
|
"version": "v3.4.6",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/http-foundation.git",
|
"url": "https://github.com/symfony/http-foundation.git",
|
||||||
"reference": "9194b33c71da8ef4d05d22964376f2f9c95a1bfd"
|
"reference": "6f5935723c11b4125fc9927db6ad2feaa196e175"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/9194b33c71da8ef4d05d22964376f2f9c95a1bfd",
|
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/6f5935723c11b4125fc9927db6ad2feaa196e175",
|
||||||
"reference": "9194b33c71da8ef4d05d22964376f2f9c95a1bfd",
|
"reference": "6f5935723c11b4125fc9927db6ad2feaa196e175",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.3.9",
|
"php": "^5.5.9|>=7.0.8",
|
||||||
"symfony/polyfill-php54": "~1.0",
|
"symfony/polyfill-mbstring": "~1.1",
|
||||||
"symfony/polyfill-php55": "~1.0"
|
"symfony/polyfill-php70": "~1.6"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"symfony/expression-language": "~2.4|~3.0.0"
|
"symfony/expression-language": "~2.8|~3.0|~4.0"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "2.8-dev"
|
"dev-master": "3.4-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
@ -500,34 +497,94 @@
|
||||||
],
|
],
|
||||||
"description": "Symfony HttpFoundation Component",
|
"description": "Symfony HttpFoundation Component",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"time": "2016-01-13 10:28:07"
|
"time": "2018-02-22T10:48:49+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-php54",
|
"name": "symfony/polyfill-mbstring",
|
||||||
"version": "v1.1.0",
|
"version": "v1.7.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-php54.git",
|
"url": "https://github.com/symfony/polyfill-mbstring.git",
|
||||||
"reference": "74663d5a2ff3c530c1bc0571500e0feec9094054"
|
"reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/74663d5a2ff3c530c1bc0571500e0feec9094054",
|
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b",
|
||||||
"reference": "74663d5a2ff3c530c1bc0571500e0feec9094054",
|
"reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.3.3"
|
"php": ">=5.3.3"
|
||||||
},
|
},
|
||||||
|
"suggest": {
|
||||||
|
"ext-mbstring": "For best performance"
|
||||||
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "1.1-dev"
|
"dev-master": "1.7-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
"Symfony\\Polyfill\\Php54\\": ""
|
"Symfony\\Polyfill\\Mbstring\\": ""
|
||||||
|
},
|
||||||
|
"files": [
|
||||||
|
"bootstrap.php"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Nicolas Grekas",
|
||||||
|
"email": "p@tchwork.com"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Symfony Community",
|
||||||
|
"homepage": "https://symfony.com/contributors"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Symfony polyfill for the Mbstring extension",
|
||||||
|
"homepage": "https://symfony.com",
|
||||||
|
"keywords": [
|
||||||
|
"compatibility",
|
||||||
|
"mbstring",
|
||||||
|
"polyfill",
|
||||||
|
"portable",
|
||||||
|
"shim"
|
||||||
|
],
|
||||||
|
"time": "2018-01-30T19:27:44+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "symfony/polyfill-php70",
|
||||||
|
"version": "v1.7.0",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/symfony/polyfill-php70.git",
|
||||||
|
"reference": "3532bfcd8f933a7816f3a0a59682fc404776600f"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/3532bfcd8f933a7816f3a0a59682fc404776600f",
|
||||||
|
"reference": "3532bfcd8f933a7816f3a0a59682fc404776600f",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"paragonie/random_compat": "~1.0|~2.0",
|
||||||
|
"php": ">=5.3.3"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"extra": {
|
||||||
|
"branch-alias": {
|
||||||
|
"dev-master": "1.7-dev"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"Symfony\\Polyfill\\Php70\\": ""
|
||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
"bootstrap.php"
|
"bootstrap.php"
|
||||||
|
@ -550,7 +607,7 @@
|
||||||
"homepage": "https://symfony.com/contributors"
|
"homepage": "https://symfony.com/contributors"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"description": "Symfony polyfill backporting some PHP 5.4+ features to lower PHP versions",
|
"description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"compatibility",
|
"compatibility",
|
||||||
|
@ -558,94 +615,43 @@
|
||||||
"portable",
|
"portable",
|
||||||
"shim"
|
"shim"
|
||||||
],
|
],
|
||||||
"time": "2016-01-20 09:13:37"
|
"time": "2018-01-30T19:27:44+00:00"
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "symfony/polyfill-php55",
|
|
||||||
"version": "v1.1.0",
|
|
||||||
"source": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/symfony/polyfill-php55.git",
|
|
||||||
"reference": "b4f3f07d91702f8f926339fc4fcf81671d8c27e6"
|
|
||||||
},
|
|
||||||
"dist": {
|
|
||||||
"type": "zip",
|
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/b4f3f07d91702f8f926339fc4fcf81671d8c27e6",
|
|
||||||
"reference": "b4f3f07d91702f8f926339fc4fcf81671d8c27e6",
|
|
||||||
"shasum": ""
|
|
||||||
},
|
|
||||||
"require": {
|
|
||||||
"ircmaxell/password-compat": "~1.0",
|
|
||||||
"php": ">=5.3.3"
|
|
||||||
},
|
|
||||||
"type": "library",
|
|
||||||
"extra": {
|
|
||||||
"branch-alias": {
|
|
||||||
"dev-master": "1.1-dev"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"autoload": {
|
|
||||||
"psr-4": {
|
|
||||||
"Symfony\\Polyfill\\Php55\\": ""
|
|
||||||
},
|
|
||||||
"files": [
|
|
||||||
"bootstrap.php"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
|
||||||
"license": [
|
|
||||||
"MIT"
|
|
||||||
],
|
|
||||||
"authors": [
|
|
||||||
{
|
|
||||||
"name": "Nicolas Grekas",
|
|
||||||
"email": "p@tchwork.com"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Symfony Community",
|
|
||||||
"homepage": "https://symfony.com/contributors"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "Symfony polyfill backporting some PHP 5.5+ features to lower PHP versions",
|
|
||||||
"homepage": "https://symfony.com",
|
|
||||||
"keywords": [
|
|
||||||
"compatibility",
|
|
||||||
"polyfill",
|
|
||||||
"portable",
|
|
||||||
"shim"
|
|
||||||
],
|
|
||||||
"time": "2016-01-20 09:13:37"
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "twig/twig",
|
"name": "twig/twig",
|
||||||
"version": "v1.24.0",
|
"version": "v2.4.7",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/twigphp/Twig.git",
|
"url": "https://github.com/twigphp/Twig.git",
|
||||||
"reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8"
|
"reference": "69aacd44dbbaa3199d5afb68605c996d577896fc"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/twigphp/Twig/zipball/3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8",
|
"url": "https://api.github.com/repos/twigphp/Twig/zipball/69aacd44dbbaa3199d5afb68605c996d577896fc",
|
||||||
"reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8",
|
"reference": "69aacd44dbbaa3199d5afb68605c996d577896fc",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.2.7"
|
"php": "^7.0",
|
||||||
|
"symfony/polyfill-mbstring": "~1.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"symfony/debug": "~2.7",
|
"psr/container": "^1.0",
|
||||||
"symfony/phpunit-bridge": "~2.7"
|
"symfony/debug": "^2.7",
|
||||||
|
"symfony/phpunit-bridge": "^3.3"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "1.24-dev"
|
"dev-master": "2.4-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-0": {
|
"psr-0": {
|
||||||
"Twig_": "lib/"
|
"Twig_": "lib/"
|
||||||
|
},
|
||||||
|
"psr-4": {
|
||||||
|
"Twig\\": "src/"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
@ -675,7 +681,7 @@
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"templating"
|
"templating"
|
||||||
],
|
],
|
||||||
"time": "2016-01-25 21:22:18"
|
"time": "2018-03-20T04:31:17+00:00"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"packages-dev": [],
|
"packages-dev": [],
|
||||||
|
@ -687,7 +693,7 @@
|
||||||
"prefer-stable": false,
|
"prefer-stable": false,
|
||||||
"prefer-lowest": false,
|
"prefer-lowest": false,
|
||||||
"platform": {
|
"platform": {
|
||||||
"php": ">=5.3.7"
|
"php": ">=5.5.9"
|
||||||
},
|
},
|
||||||
"platform-dev": []
|
"platform-dev": []
|
||||||
}
|
}
|
||||||
|
|
BIN
composer.phar
BIN
composer.phar
Binary file not shown.
|
@ -47,7 +47,9 @@ if(!empty($_SERVER['argv'])) {
|
||||||
}
|
}
|
||||||
switch($argi[0]) {
|
switch($argi[0]) {
|
||||||
case 'uri':
|
case 'uri':
|
||||||
define('PSM_BASE_URL', $argi[1]);
|
if(!defined('PSM_BASE_URL')){
|
||||||
|
define('PSM_BASE_URL', $argi[1]);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case 'timeout':
|
case 'timeout':
|
||||||
$cron_timeout = intval($argi[1]);
|
$cron_timeout = intval($argi[1]);
|
||||||
|
|
|
@ -28,9 +28,11 @@
|
||||||
namespace psm\Module;
|
namespace psm\Module;
|
||||||
use psm\Service\Database;
|
use psm\Service\Database;
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
use Symfony\Component\DependencyInjection\ContainerAware;
|
use Symfony\Component\DependencyInjection\ContainerAwareTrait;
|
||||||
|
|
||||||
abstract class AbstractController extends ContainerAware implements ControllerInterface {
|
abstract class AbstractController implements ControllerInterface {
|
||||||
|
|
||||||
|
use ContainerAwareTrait;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Current action
|
* Current action
|
||||||
|
|
|
@ -55,7 +55,7 @@ class UserController extends AbstractController {
|
||||||
$this->servers[$server['server_id']] = $server;
|
$this->servers[$server['server_id']] = $server;
|
||||||
}
|
}
|
||||||
|
|
||||||
return parent::run();
|
return parent::run($action);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -27,13 +27,16 @@
|
||||||
**/
|
**/
|
||||||
|
|
||||||
namespace psm\Util\Server;
|
namespace psm\Util\Server;
|
||||||
use Symfony\Component\DependencyInjection\ContainerAware;
|
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
|
||||||
|
use Symfony\Component\DependencyInjection\ContainerAwareTrait;
|
||||||
use Symfony\Component\DependencyInjection\ContainerInterface;
|
use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Run an update on all servers.
|
* Run an update on all servers.
|
||||||
*/
|
*/
|
||||||
class UpdateManager extends ContainerAware {
|
class UpdateManager implements ContainerAwareInterface {
|
||||||
|
|
||||||
|
use ContainerAwareTrait;
|
||||||
|
|
||||||
function __construct(ContainerInterface $container) {
|
function __construct(ContainerInterface $container) {
|
||||||
$this->container = $container;
|
$this->container = $container;
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
<!--[if lt IE 9]>
|
<!--[if lt IE 9]>
|
||||||
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
|
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
|
||||||
<![endif]-->
|
<![endif]-->
|
||||||
<script type="text/javascript" src="static/plugin/jquery-1.7.1.min.js"></script>
|
<script type="text/javascript" src="static/plugin/jquery-1.8.3.min.js"></script>
|
||||||
<script type="text/javascript" src="static/plugin/twitter-bootstrap/js/bootstrap.min.js"></script>
|
<script type="text/javascript" src="static/plugin/twitter-bootstrap/js/bootstrap.min.js"></script>
|
||||||
<script type="text/javascript" src="static/plugin/bootstrap-multiselect/bootstrap-multiselect.min.js"></script>
|
<script type="text/javascript" src="static/plugin/bootstrap-multiselect/bootstrap-multiselect.min.js"></script>
|
||||||
<script type="text/javascript" src="static/js/scripts.js"></script>
|
<script type="text/javascript" src="static/js/scripts.js"></script>
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
.multiselect-container{position:absolute;list-style-type:none;margin:0;padding:0}.multiselect-container .input-group{margin:5px}.multiselect-container>li{padding:0}.multiselect-container>li>a.multiselect-all label{font-weight:700}.multiselect-container>li>label.multiselect-group{margin:0;padding:3px 20px;height:100%;font-weight:700}.multiselect-container>li>a{padding:0}.multiselect-container>li>a>label{margin:0;height:100%;cursor:pointer;font-weight:400;padding:3px 20px 3px 40px}.multiselect-container>li>a>label.radio,.multiselect-container>li>a>label.checkbox{margin:0}.multiselect-container>li>a>label>input[type=checkbox]{margin-bottom:5px}.btn-group>.btn-group:nth-child(2)>.multiselect.btn{border-top-left-radius:4px;border-bottom-left-radius:4px}.form-inline .multiselect-container label.checkbox,.form-inline .multiselect-container label.radio{padding:3px 20px 3px 40px}.form-inline .multiselect-container li a label.checkbox input[type=checkbox],.form-inline .multiselect-container li a label.radio input[type=radio]{margin-left:-20px;margin-right:0}
|
span.multiselect-native-select{position:relative}span.multiselect-native-select select{border:0!important;clip:rect(0 0 0 0)!important;height:1px!important;margin:-1px -1px -1px -3px!important;overflow:hidden!important;padding:0!important;position:absolute!important;width:1px!important;left:50%;top:30px}.multiselect-container{position:absolute;list-style-type:none;margin:0;padding:0}.multiselect-container .input-group{margin:5px}.multiselect-container .multiselect-reset .input-group{width:93%}.multiselect-container>li{padding:0}.multiselect-container>li>a.multiselect-all label{font-weight:700}.multiselect-container>li.multiselect-group label{margin:0;padding:3px 20px;height:100%;font-weight:700}.multiselect-container>li.multiselect-group-clickable label{cursor:pointer}.multiselect-container>li>a{padding:0}.multiselect-container>li>a>label{margin:0;height:100%;cursor:pointer;font-weight:400;padding:3px 20px 3px 40px}.multiselect-container>li>a>label.checkbox,.multiselect-container>li>a>label.radio{margin:0}.multiselect-container>li>a>label>input[type=checkbox]{margin-bottom:5px}.btn-group>.btn-group:nth-child(2)>.multiselect.btn{border-top-left-radius:4px;border-bottom-left-radius:4px}.form-inline .multiselect-container label.checkbox,.form-inline .multiselect-container label.radio{padding:3px 20px 3px 40px}.form-inline .multiselect-container li a label.checkbox input[type=checkbox],.form-inline .multiselect-container li a label.radio input[type=radio]{margin-left:-20px;margin-right:0}
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -5,12 +5,12 @@
|
||||||
*
|
*
|
||||||
* About: Version
|
* About: Version
|
||||||
*
|
*
|
||||||
* version: 1.0.8
|
* version: 1.0.9
|
||||||
* revision: 1250
|
* revision: d96a669
|
||||||
*
|
*
|
||||||
* About: Copyright & License
|
* About: Copyright & License
|
||||||
*
|
*
|
||||||
* Copyright (c) 2009-2013 Chris Leonello
|
* Copyright (c) 2009-2016 Chris Leonello
|
||||||
* jqPlot is currently available for use in all personal or commercial projects
|
* jqPlot is currently available for use in all personal or commercial projects
|
||||||
* under both the MIT and GPL version 2.0 licenses. This means that you can
|
* under both the MIT and GPL version 2.0 licenses. This means that you can
|
||||||
* choose the license that best suits your project and use it accordingly.
|
* choose the license that best suits your project and use it accordingly.
|
||||||
|
@ -244,8 +244,8 @@
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
$.jqplot.version = "1.0.8";
|
$.jqplot.version = "1.0.9";
|
||||||
$.jqplot.revision = "1250";
|
$.jqplot.revision = "d96a669";
|
||||||
|
|
||||||
$.jqplot.targetCounter = 1;
|
$.jqplot.targetCounter = 1;
|
||||||
|
|
||||||
|
@ -295,6 +295,25 @@
|
||||||
if ($.jqplot.use_excanvas) {
|
if ($.jqplot.use_excanvas) {
|
||||||
return window.G_vmlCanvasManager.initElement(canvas);
|
return window.G_vmlCanvasManager.initElement(canvas);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var cctx = canvas.getContext('2d');
|
||||||
|
|
||||||
|
var canvasBackingScale = 1;
|
||||||
|
if (window.devicePixelRatio > 1 && (cctx.webkitBackingStorePixelRatio === undefined ||
|
||||||
|
cctx.webkitBackingStorePixelRatio < 2)) {
|
||||||
|
canvasBackingScale = window.devicePixelRatio;
|
||||||
|
}
|
||||||
|
var oldWidth = canvas.width;
|
||||||
|
var oldHeight = canvas.height;
|
||||||
|
|
||||||
|
canvas.width = canvasBackingScale * canvas.width;
|
||||||
|
canvas.height = canvasBackingScale * canvas.height;
|
||||||
|
canvas.style.width = oldWidth + 'px';
|
||||||
|
canvas.style.height = oldHeight + 'px';
|
||||||
|
cctx.save();
|
||||||
|
|
||||||
|
cctx.scale(canvasBackingScale, canvasBackingScale);
|
||||||
|
|
||||||
return canvas;
|
return canvas;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1307,6 +1326,7 @@
|
||||||
this._sumy = 0;
|
this._sumy = 0;
|
||||||
this._sumx = 0;
|
this._sumx = 0;
|
||||||
this._type = '';
|
this._type = '';
|
||||||
|
this.step = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
Series.prototype = new $.jqplot.ElemContainer();
|
Series.prototype = new $.jqplot.ElemContainer();
|
||||||
|
@ -3113,9 +3133,34 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
var fb = this.fillBetween;
|
var fb = this.fillBetween;
|
||||||
if (fb.fill && fb.series1 !== fb.series2 && fb.series1 < seriesLength && fb.series2 < seriesLength && series[fb.series1]._type === 'line' && series[fb.series2]._type === 'line') {
|
if(typeof fb.series1 == 'number'){
|
||||||
|
if(fb.fill&&fb.series1!==fb.series2&&fb.series1<seriesLength&&fb.series2<seriesLength&&series[fb.series1]._type==="line"&&series[fb.series2]._type==="line")
|
||||||
this.doFillBetweenLines();
|
this.doFillBetweenLines();
|
||||||
}
|
}
|
||||||
|
else{
|
||||||
|
if(fb.series1 != null && fb.series2 != null){
|
||||||
|
var doFb = false;
|
||||||
|
if(fb.series1.length === fb.series2.length){
|
||||||
|
var tempSeries1 = 0;
|
||||||
|
var tempSeries2 = 0;
|
||||||
|
|
||||||
|
for(var cnt = 0; cnt < fb.series1.length; cnt++){
|
||||||
|
tempSeries1 = fb.series1[cnt];
|
||||||
|
tempSeries2 = fb.series2[cnt];
|
||||||
|
if(tempSeries1!==tempSeries2&&tempSeries1<seriesLength&&tempSeries2<seriesLength&&series[tempSeries1]._type==="line"&&series[tempSeries2]._type==="line"){
|
||||||
|
doFb = true;
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
doFb = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(fb.fill && doFb){
|
||||||
|
this.doFillBetweenLines();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for (var i=0, l=$.jqplot.postDrawHooks.length; i<l; i++) {
|
for (var i=0, l=$.jqplot.postDrawHooks.length; i<l; i++) {
|
||||||
$.jqplot.postDrawHooks[i].call(this);
|
$.jqplot.postDrawHooks[i].call(this);
|
||||||
|
@ -3156,37 +3201,47 @@
|
||||||
|
|
||||||
jqPlot.prototype.doFillBetweenLines = function () {
|
jqPlot.prototype.doFillBetweenLines = function () {
|
||||||
var fb = this.fillBetween;
|
var fb = this.fillBetween;
|
||||||
|
var series = this.series;
|
||||||
var sid1 = fb.series1;
|
var sid1 = fb.series1;
|
||||||
var sid2 = fb.series2;
|
var sid2 = fb.series2;
|
||||||
// first series should always be lowest index
|
var id1 = 0, id2 = 0;
|
||||||
var id1 = (sid1 < sid2) ? sid1 : sid2;
|
|
||||||
var id2 = (sid2 > sid1) ? sid2 : sid1;
|
|
||||||
|
|
||||||
var series1 = this.series[id1];
|
function fill(id1, id2){
|
||||||
var series2 = this.series[id2];
|
var series1 = series[id1];
|
||||||
|
var series2 = series[id2];
|
||||||
if (series2.renderer.smooth) {
|
if (series2.renderer.smooth)
|
||||||
var tempgd = series2.renderer._smoothedData.slice(0).reverse();
|
var tempgd = series2.renderer._smoothedData.slice(0).reverse();
|
||||||
}
|
else
|
||||||
else {
|
var tempgd = series2.gridData.slice(0).reverse();
|
||||||
var tempgd = series2.gridData.slice(0).reverse();
|
if (series1.renderer.smooth)
|
||||||
|
var gd = series1.renderer._smoothedData.concat(tempgd);
|
||||||
|
else
|
||||||
|
var gd = series1.gridData.concat(tempgd);
|
||||||
|
var color = fb.color !== null ? fb.color : series[sid1].fillColor;
|
||||||
|
var baseSeries = fb.baseSeries !== null ? fb.baseSeries : id1;
|
||||||
|
var sr =
|
||||||
|
series[baseSeries].renderer.shapeRenderer;
|
||||||
|
var opts =
|
||||||
|
{
|
||||||
|
fillStyle : color,
|
||||||
|
fill : true,
|
||||||
|
closePath : true
|
||||||
|
};
|
||||||
|
sr.draw(series1.shadowCanvas._ctx, gd, opts)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (series1.renderer.smooth) {
|
if(typeof sid1 == 'number' && typeof sid2 == 'number'){
|
||||||
var gd = series1.renderer._smoothedData.concat(tempgd);
|
id1 = sid1 < sid2 ? sid1 : sid2;
|
||||||
|
id2 = sid2 > sid1 ? sid2 : sid1;
|
||||||
|
fill(id1, id2);
|
||||||
}
|
}
|
||||||
else {
|
else{
|
||||||
var gd = series1.gridData.concat(tempgd);
|
for(var cnt = 0; cnt < sid1.length ; cnt++){
|
||||||
|
id1 = sid1[cnt] < sid2[cnt] ? sid1[cnt] : sid2[cnt];
|
||||||
|
id2 = sid2[cnt] > sid1[cnt] ? sid2[cnt] : sid1[cnt];
|
||||||
|
fill(id1, id2);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var color = (fb.color !== null) ? fb.color : this.series[sid1].fillColor;
|
|
||||||
var baseSeries = (fb.baseSeries !== null) ? fb.baseSeries : id1;
|
|
||||||
|
|
||||||
// now apply a fill to the shape on the lower series shadow canvas,
|
|
||||||
// so it is behind both series.
|
|
||||||
var sr = this.series[baseSeries].renderer.shapeRenderer;
|
|
||||||
var opts = {fillStyle: color, fill: true, closePath: true};
|
|
||||||
sr.draw(series1.shadowCanvas._ctx, gd, opts);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
this.bindCustomEvents = function() {
|
this.bindCustomEvents = function() {
|
||||||
|
@ -3243,7 +3298,7 @@
|
||||||
for (j=0; j<s._barPoints.length; j++) {
|
for (j=0; j<s._barPoints.length; j++) {
|
||||||
points = s._barPoints[j];
|
points = s._barPoints[j];
|
||||||
p = s.gridData[j];
|
p = s.gridData[j];
|
||||||
if (x>points[0][0] && x<points[2][0] && y>points[2][1] && y<points[0][1]) {
|
if (x>points[0][0] && x<points[2][0] && (y>points[2][1] && y<points[0][1] || y<points[2][1] && y>points[0][1])) {
|
||||||
return {seriesIndex:s.index, pointIndex:j, gridData:p, data:s.data[j], points:s._barPoints[j]};
|
return {seriesIndex:s.index, pointIndex:j, gridData:p, data:s.data[j], points:s._barPoints[j]};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -5624,6 +5679,9 @@
|
||||||
for (var i=0; i<data.length; i++) {
|
for (var i=0; i<data.length; i++) {
|
||||||
// if not a line series or if no nulls in data, push the converted point onto the array.
|
// if not a line series or if no nulls in data, push the converted point onto the array.
|
||||||
if (data[i][0] != null && data[i][1] != null) {
|
if (data[i][0] != null && data[i][1] != null) {
|
||||||
|
if (this.step && i>0) {
|
||||||
|
gd.push([xp.call(this._xaxis, data[i][0]), yp.call(this._yaxis, data[i-1][1])]);
|
||||||
|
}
|
||||||
gd.push([xp.call(this._xaxis, data[i][0]), yp.call(this._yaxis, data[i][1])]);
|
gd.push([xp.call(this._xaxis, data[i][0]), yp.call(this._yaxis, data[i][1])]);
|
||||||
}
|
}
|
||||||
// else if there is a null, preserve it.
|
// else if there is a null, preserve it.
|
||||||
|
@ -9139,7 +9197,7 @@
|
||||||
|
|
||||||
for (var i=0; i<wl; i++) {
|
for (var i=0; i<wl; i++) {
|
||||||
w += words[i];
|
w += words[i];
|
||||||
if (context.measureText(w).width > tagwidth) {
|
if (context.measureText(w).width > tagwidth && w.length > words[i].length) {
|
||||||
breaks.push(i);
|
breaks.push(i);
|
||||||
w = '';
|
w = '';
|
||||||
i--;
|
i--;
|
||||||
|
@ -9327,7 +9385,7 @@
|
||||||
* @author Chris Leonello
|
* @author Chris Leonello
|
||||||
* @date #date#
|
* @date #date#
|
||||||
* @version #VERSION#
|
* @version #VERSION#
|
||||||
* @copyright (c) 2010-2013 Chris Leonello
|
* @copyright (c) 2010-2015 Chris Leonello
|
||||||
* jsDate is currently available for use in all personal or commercial projects
|
* jsDate is currently available for use in all personal or commercial projects
|
||||||
* under both the MIT and GPL version 2.0 licenses. This means that you can
|
* under both the MIT and GPL version 2.0 licenses. This means that you can
|
||||||
* choose the license that best suits your project and use it accordingly.
|
* choose the license that best suits your project and use it accordingly.
|
||||||
|
@ -10034,10 +10092,18 @@
|
||||||
|
|
||||||
'sv': {
|
'sv': {
|
||||||
monthNames: ['januari','februari','mars','april','maj','juni','juli','augusti','september','oktober','november','december'],
|
monthNames: ['januari','februari','mars','april','maj','juni','juli','augusti','september','oktober','november','december'],
|
||||||
monthNamesShort: ['jan','feb','mar','apr','maj','jun','jul','aug','sep','okt','nov','dec'],
|
monthNamesShort: ['jan','feb','mar','apr','maj','jun','jul','aug','sep','okt','nov','dec'],
|
||||||
dayNames: ['söndag','måndag','tisdag','onsdag','torsdag','fredag','lördag'],
|
dayNames: ['söndag','måndag','tisdag','onsdag','torsdag','fredag','lördag'],
|
||||||
dayNamesShort: ['sön','mån','tis','ons','tor','fre','lör'],
|
dayNamesShort: ['sön','mån','tis','ons','tor','fre','lör'],
|
||||||
formatString: '%Y-%m-%d %H:%M:%S'
|
formatString: '%Y-%m-%d %H:%M:%S'
|
||||||
|
},
|
||||||
|
|
||||||
|
'it': {
|
||||||
|
monthNames: ['Gennaio','Febbraio','Marzo','Aprile','Maggio','Giugno','Luglio','Agosto','Settembre','Ottobre','Novembre','Dicembre'],
|
||||||
|
monthNamesShort: ['Gen','Feb','Mar','Apr','Mag','Giu','Lug','Ago','Set','Ott','Nov','Dic'],
|
||||||
|
dayNames: ['Domenica','Lunedi','Martedi','Mercoledi','Giovedi','Venerdi','Sabato'],
|
||||||
|
dayNamesShort: ['Dom','Lun','Mar','Mer','Gio','Ven','Sab'],
|
||||||
|
formatString: '%d-%m-%Y %H:%M:%S'
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
.jqplot-target{position:relative;color:#666;font-family:"Trebuchet MS",Arial,Helvetica,sans-serif;font-size:1em}.jqplot-axis{font-size:.75em}.jqplot-xaxis{margin-top:10px}.jqplot-x2axis{margin-bottom:10px}.jqplot-yaxis{margin-right:10px}.jqplot-y2axis,.jqplot-y3axis,.jqplot-y4axis,.jqplot-y5axis,.jqplot-y6axis,.jqplot-y7axis,.jqplot-y8axis,.jqplot-y9axis,.jqplot-yMidAxis{margin-left:10px;margin-right:10px}.jqplot-axis-tick,.jqplot-xaxis-tick,.jqplot-yaxis-tick,.jqplot-x2axis-tick,.jqplot-y2axis-tick,.jqplot-y3axis-tick,.jqplot-y4axis-tick,.jqplot-y5axis-tick,.jqplot-y6axis-tick,.jqplot-y7axis-tick,.jqplot-y8axis-tick,.jqplot-y9axis-tick,.jqplot-yMidAxis-tick{position:absolute;white-space:pre}.jqplot-xaxis-tick{top:0;left:15px;vertical-align:top}.jqplot-x2axis-tick{bottom:0;left:15px;vertical-align:bottom}.jqplot-yaxis-tick{right:0;top:15px;text-align:right}.jqplot-yaxis-tick.jqplot-breakTick{right:-20px;margin-right:0;padding:1px 5px 1px 5px;z-index:2;font-size:1.5em}.jqplot-y2axis-tick,.jqplot-y3axis-tick,.jqplot-y4axis-tick,.jqplot-y5axis-tick,.jqplot-y6axis-tick,.jqplot-y7axis-tick,.jqplot-y8axis-tick,.jqplot-y9axis-tick{left:0;top:15px;text-align:left}.jqplot-yMidAxis-tick{text-align:center;white-space:nowrap}.jqplot-xaxis-label{margin-top:10px;font-size:11pt;position:absolute}.jqplot-x2axis-label{margin-bottom:10px;font-size:11pt;position:absolute}.jqplot-yaxis-label{margin-right:10px;font-size:11pt;position:absolute}.jqplot-yMidAxis-label{font-size:11pt;position:absolute}.jqplot-y2axis-label,.jqplot-y3axis-label,.jqplot-y4axis-label,.jqplot-y5axis-label,.jqplot-y6axis-label,.jqplot-y7axis-label,.jqplot-y8axis-label,.jqplot-y9axis-label{font-size:11pt;margin-left:10px;position:absolute}.jqplot-meterGauge-tick{font-size:.75em;color:#999}.jqplot-meterGauge-label{font-size:1em;color:#999}table.jqplot-table-legend{margin-top:12px;margin-bottom:12px;margin-left:12px;margin-right:12px}table.jqplot-table-legend,table.jqplot-cursor-legend{background-color:rgba(255,255,255,0.6);border:1px solid #ccc;position:absolute;font-size:.75em}td.jqplot-table-legend{vertical-align:middle}td.jqplot-seriesToggle:hover,td.jqplot-seriesToggle:active{cursor:pointer}.jqplot-table-legend .jqplot-series-hidden{text-decoration:line-through}div.jqplot-table-legend-swatch-outline{border:1px solid #ccc;padding:1px}div.jqplot-table-legend-swatch{width:0;height:0;border-top-width:5px;border-bottom-width:5px;border-left-width:6px;border-right-width:6px;border-top-style:solid;border-bottom-style:solid;border-left-style:solid;border-right-style:solid}.jqplot-title{top:0;left:0;padding-bottom:.5em;font-size:1.2em}table.jqplot-cursor-tooltip{border:1px solid #ccc;font-size:.75em}.jqplot-cursor-tooltip{border:1px solid #ccc;font-size:.75em;white-space:nowrap;background:rgba(208,208,208,0.5);padding:1px}.jqplot-highlighter-tooltip,.jqplot-canvasOverlay-tooltip{border:1px solid #ccc;font-size:.75em;white-space:nowrap;background:rgba(208,208,208,0.5);padding:1px}.jqplot-point-label{font-size:.75em;z-index:2}td.jqplot-cursor-legend-swatch{vertical-align:middle;text-align:center}div.jqplot-cursor-legend-swatch{width:1.2em;height:.7em}.jqplot-error{text-align:center}.jqplot-error-message{position:relative;top:46%;display:inline-block}div.jqplot-bubble-label{font-size:.8em;padding-left:2px;padding-right:2px;color:rgb(20%,20%,20%)}div.jqplot-bubble-label.jqplot-bubble-label-highlight{background:rgba(90%,90%,90%,0.7)}div.jqplot-noData-container{text-align:center;background-color:rgba(96%,96%,96%,0.3)}
|
.jqplot-xaxis,.jqplot-xaxis-label{margin-top:10px}.jqplot-x2axis,.jqplot-x2axis-label{margin-bottom:10px}.jqplot-target{position:relative;color:#666;font-family:"Trebuchet MS",Arial,Helvetica,sans-serif;font-size:1em}.jqplot-axis{font-size:.75em}.jqplot-yaxis{margin-right:10px}.jqplot-y2axis,.jqplot-y3axis,.jqplot-y4axis,.jqplot-y5axis,.jqplot-y6axis,.jqplot-y7axis,.jqplot-y8axis,.jqplot-y9axis,.jqplot-yMidAxis{margin-left:10px;margin-right:10px}.jqplot-axis-tick,.jqplot-x2axis-tick,.jqplot-xaxis-tick,.jqplot-y2axis-tick,.jqplot-y3axis-tick,.jqplot-y4axis-tick,.jqplot-y5axis-tick,.jqplot-y6axis-tick,.jqplot-y7axis-tick,.jqplot-y8axis-tick,.jqplot-y9axis-tick,.jqplot-yMidAxis-tick,.jqplot-yaxis-tick{position:absolute;white-space:pre}.jqplot-xaxis-tick{top:0;left:15px;vertical-align:top}.jqplot-x2axis-tick{bottom:0;left:15px;vertical-align:bottom}.jqplot-yaxis-tick{right:0;top:15px;text-align:right}.jqplot-yaxis-tick.jqplot-breakTick{right:-20px;margin-right:0;padding:1px 5px;z-index:2;font-size:1.5em}.jqplot-x2axis-label,.jqplot-xaxis-label,.jqplot-yMidAxis-label,.jqplot-yaxis-label{font-size:11pt;position:absolute}.jqplot-y2axis-tick,.jqplot-y3axis-tick,.jqplot-y4axis-tick,.jqplot-y5axis-tick,.jqplot-y6axis-tick,.jqplot-y7axis-tick,.jqplot-y8axis-tick,.jqplot-y9axis-tick{left:0;top:15px;text-align:left}.jqplot-yMidAxis-tick{text-align:center;white-space:nowrap}.jqplot-yaxis-label{margin-right:10px}.jqplot-y2axis-label,.jqplot-y3axis-label,.jqplot-y4axis-label,.jqplot-y5axis-label,.jqplot-y6axis-label,.jqplot-y7axis-label,.jqplot-y8axis-label,.jqplot-y9axis-label{font-size:11pt;margin-left:10px;position:absolute}.jqplot-meterGauge-tick{font-size:.75em;color:#999}.jqplot-meterGauge-label{font-size:1em;color:#999}table.jqplot-table-legend{margin:12px}table.jqplot-cursor-legend,table.jqplot-table-legend{background-color:rgba(255,255,255,.6);border:1px solid #ccc;position:absolute;font-size:.75em}td.jqplot-table-legend{vertical-align:middle}td.jqplot-seriesToggle:active,td.jqplot-seriesToggle:hover{cursor:pointer}.jqplot-table-legend .jqplot-series-hidden{text-decoration:line-through}div.jqplot-table-legend-swatch-outline{border:1px solid #ccc;padding:1px}div.jqplot-table-legend-swatch{width:0;height:0;border-width:5px 6px;border-style:solid}.jqplot-title{top:0;left:0;padding-bottom:.5em;font-size:1.2em}table.jqplot-cursor-tooltip{border:1px solid #ccc;font-size:.75em}.jqplot-canvasOverlay-tooltip,.jqplot-cursor-tooltip,.jqplot-highlighter-tooltip{border:1px solid #ccc;font-size:.75em;white-space:nowrap;background:rgba(208,208,208,.5);padding:1px}.jqplot-point-label{font-size:.75em;z-index:2}td.jqplot-cursor-legend-swatch{vertical-align:middle;text-align:center}div.jqplot-cursor-legend-swatch{width:1.2em;height:.7em}.jqplot-error{text-align:center}.jqplot-error-message{position:relative;top:46%;display:inline-block}div.jqplot-bubble-label{font-size:.8em;padding-left:2px;padding-right:2px;color:rgb(20%,20%,20%)}div.jqplot-bubble-label.jqplot-bubble-label-highlight{background:rgba(90%,90%,90%,.7)}div.jqplot-noData-container{text-align:center;background-color:rgba(96%,96%,96%,.3)}
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue