From 5b7c9f7e72a7d79d64b33fa8bbea20bf9110db10 Mon Sep 17 00:00:00 2001 From: marcdeb1 Date: Wed, 12 Dec 2018 00:22:39 +0100 Subject: [PATCH 1/2] Fixing mining inflation chart bug --- composer.lock | 263 ++++++++++++++++----------- webroot/js/mining-inflation-chart.js | 3 +- 2 files changed, 157 insertions(+), 109 deletions(-) diff --git a/composer.lock b/composer.lock index 639cfca..28de4dc 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,9 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "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#installing-dependencies", "This file is @generated automatically" ], - "hash": "654f4b2fd4cf16d217bd2c8d6431357c", "content-hash": "d6441e245d73b6c3db3a627313143bff", "packages": [ { @@ -51,7 +50,7 @@ "l10n", "localization" ], - "time": "2017-01-20 05:00:11" + "time": "2017-01-20T05:00:11+00:00" }, { "name": "bacon/bacon-qr-code", @@ -97,20 +96,20 @@ ], "description": "BaconQrCode is a QR code generator for PHP.", "homepage": "https://github.com/Bacon/BaconQrCode", - "time": "2017-10-17 09:59:25" + "time": "2017-10-17T09:59:25+00:00" }, { "name": "cakephp/cakephp", - "version": "3.6.13", + "version": "3.7.0", "source": { "type": "git", "url": "https://github.com/cakephp/cakephp.git", - "reference": "6a0b9c74710a56c5974d1c8229c7a91dac780402" + "reference": "56f2d2a69870031cd0527d63a2ddeb3fbe6f05d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/cakephp/zipball/6a0b9c74710a56c5974d1c8229c7a91dac780402", - "reference": "6a0b9c74710a56c5974d1c8229c7a91dac780402", + "url": "https://api.github.com/repos/cakephp/cakephp/zipball/56f2d2a69870031cd0527d63a2ddeb3fbe6f05d3", + "reference": "56f2d2a69870031cd0527d63a2ddeb3fbe6f05d3", "shasum": "" }, "require": { @@ -120,6 +119,7 @@ "ext-mbstring": "*", "php": ">=5.6.0", "psr/log": "^1.0.0", + "psr/simple-cache": "^1.0.0", "zendframework/zend-diactoros": "^1.4.0" }, "conflict": { @@ -145,6 +145,7 @@ "phpunit/phpunit": "^5.7.14|^6.0" }, "suggest": { + "ext-curl": "To enable more efficient network calls in Http\\Client.", "ext-openssl": "To use Security::encrypt() or have secure CSRF token generation.", "lib-ICU": "The intl PHP library, to use Text::transliterate() or Text::slug()" }, @@ -183,7 +184,7 @@ "rapid-development", "validation" ], - "time": "2018-11-04 20:29:27" + "time": "2018-12-09T01:19:50+00:00" }, { "name": "cakephp/chronos", @@ -240,7 +241,7 @@ "datetime", "time" ], - "time": "2018-10-18 22:02:21" + "time": "2018-10-18T22:02:21+00:00" }, { "name": "cakephp/migrations", @@ -293,7 +294,7 @@ "cakephp", "migrations" ], - "time": "2018-04-16 01:35:59" + "time": "2018-04-16T01:35:59+00:00" }, { "name": "cakephp/plugin-installer", @@ -334,7 +335,7 @@ } ], "description": "A composer installer for CakePHP 3.0+ plugins.", - "time": "2017-12-24 21:09:29" + "time": "2017-12-24T21:09:29+00:00" }, { "name": "endroid/qrcode", @@ -404,7 +405,7 @@ "symfony" ], "abandoned": "endroid/qr-code", - "time": "2018-05-09 20:26:30" + "time": "2018-05-09T20:26:30+00:00" }, { "name": "fgrosse/phpasn1", @@ -473,7 +474,7 @@ "x509", "x690" ], - "time": "2018-12-02 01:34:34" + "time": "2018-12-02T01:34:34+00:00" }, { "name": "khanamiryan/qrcode-detector-decoder", @@ -523,20 +524,20 @@ "qr", "zxing" ], - "time": "2017-01-13 09:11:46" + "time": "2017-01-13T09:11:46+00:00" }, { "name": "mdanter/ecc", - "version": "v0.5.1", + "version": "v0.5.2", "source": { "type": "git", "url": "https://github.com/phpecc/phpecc.git", - "reference": "9a3aca17c6dfc04bdaad2e7ddab3b8df656ffc5b" + "reference": "b95f25cc1bacc83a9f0ccd375900b7cfd343029e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpecc/phpecc/zipball/9a3aca17c6dfc04bdaad2e7ddab3b8df656ffc5b", - "reference": "9a3aca17c6dfc04bdaad2e7ddab3b8df656ffc5b", + "url": "https://api.github.com/repos/phpecc/phpecc/zipball/b95f25cc1bacc83a9f0ccd375900b7cfd343029e", + "reference": "b95f25cc1bacc83a9f0ccd375900b7cfd343029e", "shasum": "" }, "require": { @@ -595,7 +596,7 @@ "secp256k1", "secp256r1" ], - "time": "2018-12-01 23:35:23" + "time": "2018-12-03T18:17:01+00:00" }, { "name": "mobiledetect/mobiledetectlib", @@ -647,7 +648,7 @@ "mobile detector", "php mobile detect" ], - "time": "2018-09-01 15:05:15" + "time": "2018-09-01T15:05:15+00:00" }, { "name": "myclabs/php-enum", @@ -691,7 +692,7 @@ "keywords": [ "enum" ], - "time": "2018-10-30 14:36:18" + "time": "2018-10-30T14:36:18+00:00" }, { "name": "nesbot/carbon", @@ -749,7 +750,7 @@ "datetime", "time" ], - "time": "2018-11-22 18:23:02" + "time": "2018-11-22T18:23:02+00:00" }, { "name": "predis/predis", @@ -799,7 +800,7 @@ "predis", "redis" ], - "time": "2016-06-16 16:22:20" + "time": "2016-06-16T16:22:20+00:00" }, { "name": "psr/http-message", @@ -849,7 +850,7 @@ "request", "response" ], - "time": "2016-08-06 14:39:51" + "time": "2016-08-06T14:39:51+00:00" }, { "name": "psr/log", @@ -896,7 +897,55 @@ "psr", "psr-3" ], - "time": "2018-11-20 15:27:04" + "time": "2018-11-20T15:27:04+00:00" + }, + { + "name": "psr/simple-cache", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/simple-cache.git", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\SimpleCache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interfaces for simple caching", + "keywords": [ + "cache", + "caching", + "psr", + "psr-16", + "simple-cache" + ], + "time": "2017-10-23T01:57:42+00:00" }, { "name": "robmorgan/phinx", @@ -962,11 +1011,11 @@ "migrations", "phinx" ], - "time": "2017-06-05 13:30:19" + "time": "2017-06-05T13:30:19+00:00" }, { "name": "symfony/config", - "version": "v3.4.19", + "version": "v3.4.20", "source": { "type": "git", "url": "https://github.com/symfony/config.git", @@ -1026,11 +1075,11 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2018-11-26 10:17:44" + "time": "2018-11-26T10:17:44+00:00" }, { "name": "symfony/console", - "version": "v3.4.19", + "version": "v3.4.20", "source": { "type": "git", "url": "https://github.com/symfony/console.git", @@ -1095,20 +1144,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-11-26 12:48:07" + "time": "2018-11-26T12:48:07+00:00" }, { "name": "symfony/contracts", - "version": "v1.0.1", + "version": "v1.0.2", "source": { "type": "git", "url": "https://github.com/symfony/contracts.git", - "reference": "3edf0ab943d1985a356721952cba36ff31bd6e5f" + "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/contracts/zipball/3edf0ab943d1985a356721952cba36ff31bd6e5f", - "reference": "3edf0ab943d1985a356721952cba36ff31bd6e5f", + "url": "https://api.github.com/repos/symfony/contracts/zipball/1aa7ab2429c3d594dd70689604b5cf7421254cdf", + "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf", "shasum": "" }, "require": { @@ -1163,11 +1212,11 @@ "interoperability", "standards" ], - "time": "2018-11-24 09:35:08" + "time": "2018-12-05T08:06:11+00:00" }, { "name": "symfony/debug", - "version": "v4.2.0", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", @@ -1219,11 +1268,11 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2018-11-28 18:24:18" + "time": "2018-11-28T18:24:18+00:00" }, { "name": "symfony/filesystem", - "version": "v4.2.0", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", @@ -1269,11 +1318,11 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2018-11-11 19:52:12" + "time": "2018-11-11T19:52:12+00:00" }, { "name": "symfony/options-resolver", - "version": "v2.8.48", + "version": "v2.8.49", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", @@ -1323,7 +1372,7 @@ "configuration", "options" ], - "time": "2018-11-11 11:18:13" + "time": "2018-11-11T11:18:13+00:00" }, { "name": "symfony/polyfill-ctype", @@ -1381,7 +1430,7 @@ "polyfill", "portable" ], - "time": "2018-08-06 14:22:27" + "time": "2018-08-06T14:22:27+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -1440,11 +1489,11 @@ "portable", "shim" ], - "time": "2018-09-21 13:07:52" + "time": "2018-09-21T13:07:52+00:00" }, { "name": "symfony/property-access", - "version": "v2.8.48", + "version": "v2.8.49", "source": { "type": "git", "url": "https://github.com/symfony/property-access.git", @@ -1501,25 +1550,25 @@ "property path", "reflection" ], - "time": "2018-11-11 11:18:13" + "time": "2018-11-11T11:18:13+00:00" }, { "name": "symfony/translation", - "version": "v4.2.0", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "ff9a878c9b8f8bcd4d9138e2d32f508c942773d9" + "reference": "c0e2191e9bed845946ab3d99767513b56ca7dcd6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/ff9a878c9b8f8bcd4d9138e2d32f508c942773d9", - "reference": "ff9a878c9b8f8bcd4d9138e2d32f508c942773d9", + "url": "https://api.github.com/repos/symfony/translation/zipball/c0e2191e9bed845946ab3d99767513b56ca7dcd6", + "reference": "c0e2191e9bed845946ab3d99767513b56ca7dcd6", "shasum": "" }, "require": { "php": "^7.1.3", - "symfony/contracts": "^1.0", + "symfony/contracts": "^1.0.2", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { @@ -1574,11 +1623,11 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2018-11-27 07:20:32" + "time": "2018-12-06T10:45:32+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.19", + "version": "v3.4.20", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", @@ -1633,7 +1682,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-11-11 19:48:54" + "time": "2018-11-11T19:48:54+00:00" }, { "name": "zendframework/zend-diactoros", @@ -1697,22 +1746,22 @@ "psr", "psr-7" ], - "time": "2018-09-05 19:29:37" + "time": "2018-09-05T19:29:37+00:00" } ], "packages-dev": [ { "name": "ajgl/breakpoint-twig-extension", - "version": "0.3.1", + "version": "0.3.2", "source": { "type": "git", "url": "https://github.com/ajgarlag/AjglBreakpointTwigExtension.git", - "reference": "360ec6351ad7e1968ee78abb31430046c2e04fc5" + "reference": "bb419d13775d8fb5cd03b31012eaf496b31b444f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ajgarlag/AjglBreakpointTwigExtension/zipball/360ec6351ad7e1968ee78abb31430046c2e04fc5", - "reference": "360ec6351ad7e1968ee78abb31430046c2e04fc5", + "url": "https://api.github.com/repos/ajgarlag/AjglBreakpointTwigExtension/zipball/bb419d13775d8fb5cd03b31012eaf496b31b444f", + "reference": "bb419d13775d8fb5cd03b31012eaf496b31b444f", "shasum": "" }, "require": { @@ -1720,9 +1769,9 @@ "twig/twig": "^1.14|^2.0" }, "require-dev": { - "phpunit/phpunit": "^5", - "symfony/framework-bundle": "^2.7|^3.2", - "symfony/twig-bundle": "^2.7|^3.2" + "symfony/framework-bundle": "^2.7|^3.2|^4.1", + "symfony/phpunit-bridge": "^3.4|^4.1", + "symfony/twig-bundle": "^2.7|^3.2|^4.1" }, "suggest": { "ext-xdebug": "The Xdebug extension is required for the breakpoint to work", @@ -1759,7 +1808,7 @@ "breakpoint", "twig" ], - "time": "2017-11-20 13:04:11" + "time": "2018-12-10T08:22:36+00:00" }, { "name": "aptoma/twig-markdown", @@ -1816,7 +1865,7 @@ "markdown", "twig" ], - "time": "2015-10-23 20:27:08" + "time": "2015-10-23T20:27:08+00:00" }, { "name": "asm89/twig-cache-extension", @@ -1870,24 +1919,24 @@ "extension", "twig" ], - "time": "2017-01-10 22:04:15" + "time": "2017-01-10T22:04:15+00:00" }, { "name": "cakephp/bake", - "version": "1.8.6", + "version": "1.9.0", "source": { "type": "git", "url": "https://github.com/cakephp/bake.git", - "reference": "bfa552a92a01cb1c878b3a3a67899fcd21569818" + "reference": "b69b9200d366634c75d68b2dff1362b16c7a8c1c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/bake/zipball/bfa552a92a01cb1c878b3a3a67899fcd21569818", - "reference": "bfa552a92a01cb1c878b3a3a67899fcd21569818", + "url": "https://api.github.com/repos/cakephp/bake/zipball/b69b9200d366634c75d68b2dff1362b16c7a8c1c", + "reference": "b69b9200d366634c75d68b2dff1362b16c7a8c1c", "shasum": "" }, "require": { - "cakephp/cakephp": "^3.6.12", + "cakephp/cakephp": "^3.7.0", "cakephp/plugin-installer": "^1.0", "php": ">=5.6.0", "wyrihaximus/twig-view": "^4.3.4" @@ -1918,24 +1967,24 @@ "bake", "cakephp" ], - "time": "2018-11-17 03:34:24" + "time": "2018-12-01T03:00:02+00:00" }, { "name": "cakephp/debug_kit", - "version": "3.16.6", + "version": "3.17.0", "source": { "type": "git", "url": "https://github.com/cakephp/debug_kit.git", - "reference": "b6a75d47b2b1be6f6db31fbdf60ed5e062f310db" + "reference": "6a9023ecc4ac0983c184cedf8e6142ab8ea4a3ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/debug_kit/zipball/b6a75d47b2b1be6f6db31fbdf60ed5e062f310db", - "reference": "b6a75d47b2b1be6f6db31fbdf60ed5e062f310db", + "url": "https://api.github.com/repos/cakephp/debug_kit/zipball/6a9023ecc4ac0983c184cedf8e6142ab8ea4a3ff", + "reference": "6a9023ecc4ac0983c184cedf8e6142ab8ea4a3ff", "shasum": "" }, "require": { - "cakephp/cakephp": "^3.6.0", + "cakephp/cakephp": "^3.7.0", "cakephp/chronos": "^1.0.0", "cakephp/plugin-installer": "^1.0.0", "composer/composer": "^1.3.0", @@ -1978,7 +2027,7 @@ "debug", "kit" ], - "time": "2018-11-22 15:19:18" + "time": "2018-12-02T03:27:26+00:00" }, { "name": "composer/ca-bundle", @@ -2034,7 +2083,7 @@ "ssl", "tls" ], - "time": "2018-10-18 06:09:13" + "time": "2018-10-18T06:09:13+00:00" }, { "name": "composer/composer", @@ -2114,7 +2163,7 @@ "dependency", "package" ], - "time": "2018-12-03 09:31:16" + "time": "2018-12-03T09:31:16+00:00" }, { "name": "composer/semver", @@ -2176,7 +2225,7 @@ "validation", "versioning" ], - "time": "2016-08-30 16:08:34" + "time": "2016-08-30T16:08:34+00:00" }, { "name": "composer/spdx-licenses", @@ -2237,7 +2286,7 @@ "spdx", "validator" ], - "time": "2018-11-01 09:45:54" + "time": "2018-11-01T09:45:54+00:00" }, { "name": "composer/xdebug-handler", @@ -2281,7 +2330,7 @@ "Xdebug", "performance" ], - "time": "2018-11-29 10:59:02" + "time": "2018-11-29T10:59:02+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -2314,7 +2363,7 @@ "MIT" ], "description": "implementation of xdg base directory specification for php", - "time": "2014-10-24 07:27:01" + "time": "2014-10-24T07:27:01+00:00" }, { "name": "jakub-onderka/php-console-color", @@ -2356,7 +2405,7 @@ "email": "jakub.onderka@gmail.com" } ], - "time": "2018-09-29 17:23:10" + "time": "2018-09-29T17:23:10+00:00" }, { "name": "jakub-onderka/php-console-highlighter", @@ -2402,7 +2451,7 @@ } ], "description": "Highlight PHP code in terminal", - "time": "2018-09-29 18:48:56" + "time": "2018-09-29T18:48:56+00:00" }, { "name": "jasny/twig-extensions", @@ -2462,7 +2511,7 @@ "text", "time" ], - "time": "2017-09-13 07:38:01" + "time": "2017-09-13T07:38:01+00:00" }, { "name": "jdorn/sql-formatter", @@ -2512,7 +2561,7 @@ "highlight", "sql" ], - "time": "2014-01-12 16:20:24" + "time": "2014-01-12T16:20:24+00:00" }, { "name": "justinrainbow/json-schema", @@ -2578,7 +2627,7 @@ "json", "schema" ], - "time": "2018-02-14 22:26:30" + "time": "2018-02-14T22:26:30+00:00" }, { "name": "nikic/php-parser", @@ -2629,7 +2678,7 @@ "parser", "php" ], - "time": "2018-10-10 09:24:14" + "time": "2018-10-10T09:24:14+00:00" }, { "name": "psy/psysh", @@ -2703,7 +2752,7 @@ "interactive", "shell" ], - "time": "2018-10-13 15:16:03" + "time": "2018-10-13T15:16:03+00:00" }, { "name": "seld/jsonlint", @@ -2752,7 +2801,7 @@ "parser", "validator" ], - "time": "2018-01-24 12:46:19" + "time": "2018-01-24T12:46:19+00:00" }, { "name": "seld/phar-utils", @@ -2796,11 +2845,11 @@ "keywords": [ "phra" ], - "time": "2015-10-13 18:44:15" + "time": "2015-10-13T18:44:15+00:00" }, { "name": "symfony/finder", - "version": "v4.2.0", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -2845,7 +2894,7 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2018-11-11 19:52:12" + "time": "2018-11-11T19:52:12+00:00" }, { "name": "symfony/polyfill-php72", @@ -2900,11 +2949,11 @@ "portable", "shim" ], - "time": "2018-09-21 13:07:52" + "time": "2018-09-21T13:07:52+00:00" }, { "name": "symfony/process", - "version": "v4.2.0", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/process.git", @@ -2949,11 +2998,11 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2018-11-20 16:22:05" + "time": "2018-11-20T16:22:05+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.2.0", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", @@ -3024,7 +3073,7 @@ "debug", "dump" ], - "time": "2018-11-25 12:50:42" + "time": "2018-11-25T12:50:42+00:00" }, { "name": "twig/twig", @@ -3090,7 +3139,7 @@ "keywords": [ "templating" ], - "time": "2018-07-13 07:12:17" + "time": "2018-07-13T07:12:17+00:00" }, { "name": "umpirsky/twig-php-function", @@ -3131,27 +3180,27 @@ } ], "description": "Call (almost) any PHP function from your Twig templates.", - "time": "2016-03-12 16:36:32" + "time": "2016-03-12T16:36:32+00:00" }, { "name": "wyrihaximus/twig-view", - "version": "4.3.5", + "version": "4.3.7", "source": { "type": "git", "url": "https://github.com/WyriHaximus/TwigView.git", - "reference": "ec2771e6a1fe799f9b16eff19da424cd04d593b7" + "reference": "54d69c1fd36897120a7e0a9301f95adb93aa929d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WyriHaximus/TwigView/zipball/ec2771e6a1fe799f9b16eff19da424cd04d593b7", - "reference": "ec2771e6a1fe799f9b16eff19da424cd04d593b7", + "url": "https://api.github.com/repos/WyriHaximus/TwigView/zipball/54d69c1fd36897120a7e0a9301f95adb93aa929d", + "reference": "54d69c1fd36897120a7e0a9301f95adb93aa929d", "shasum": "" }, "require": { "ajgl/breakpoint-twig-extension": "^0.3.0", "aptoma/twig-markdown": "^2.0", "asm89/twig-cache-extension": "^1.0", - "cakephp/cakephp": "^3.5", + "cakephp/cakephp": "^3.6", "jasny/twig-extensions": "^1.0", "php": "^5.6 || ^7.0", "twig/twig": "^1.27", @@ -3189,7 +3238,7 @@ "twig", "view" ], - "time": "2018-07-03 15:46:29" + "time": "2018-12-11T07:04:21+00:00" } ], "aliases": [], diff --git a/webroot/js/mining-inflation-chart.js b/webroot/js/mining-inflation-chart.js index e43411c..6d53677 100644 --- a/webroot/js/mining-inflation-chart.js +++ b/webroot/js/mining-inflation-chart.js @@ -85,7 +85,6 @@ function buildChartData(blockData) { inflationRate = ((supply - lastYearSupply) / lastYearSupply) * 100; if(i % skip == 0) { // Only push 1/ of all blocks to optimize data loading chartData.push({ - date: new Date(blockTime * 1000), date: new Date(blockTime * 1000), AvailableSupply: supply, RewardLBC: reward, @@ -99,7 +98,7 @@ function buildChartData(blockData) { function loadChartData() { var api_url = "https://chainquery.lbry.io/api/sql?query="; - var query = "SELECT id, block_time FROM block"; + var query = "SELECT height, block_time FROM block WHERE confirmations > 0 ORDER BY height"; var url = api_url + query; var loadProgress = $('.mining-inflation-chart-container .load-progress'); $.ajax({ -- 2.45.2 From 0df9658b87bddaf433d0f27a7cf3e8650c2e4682 Mon Sep 17 00:00:00 2001 From: marcdeb1 Date: Wed, 12 Dec 2018 00:40:49 +0100 Subject: [PATCH 2/2] composer --- composer.lock | 263 ++++++++++++++++++++------------------------------ 1 file changed, 107 insertions(+), 156 deletions(-) diff --git a/composer.lock b/composer.lock index 28de4dc..639cfca 100644 --- a/composer.lock +++ b/composer.lock @@ -1,9 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], + "hash": "654f4b2fd4cf16d217bd2c8d6431357c", "content-hash": "d6441e245d73b6c3db3a627313143bff", "packages": [ { @@ -50,7 +51,7 @@ "l10n", "localization" ], - "time": "2017-01-20T05:00:11+00:00" + "time": "2017-01-20 05:00:11" }, { "name": "bacon/bacon-qr-code", @@ -96,20 +97,20 @@ ], "description": "BaconQrCode is a QR code generator for PHP.", "homepage": "https://github.com/Bacon/BaconQrCode", - "time": "2017-10-17T09:59:25+00:00" + "time": "2017-10-17 09:59:25" }, { "name": "cakephp/cakephp", - "version": "3.7.0", + "version": "3.6.13", "source": { "type": "git", "url": "https://github.com/cakephp/cakephp.git", - "reference": "56f2d2a69870031cd0527d63a2ddeb3fbe6f05d3" + "reference": "6a0b9c74710a56c5974d1c8229c7a91dac780402" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/cakephp/zipball/56f2d2a69870031cd0527d63a2ddeb3fbe6f05d3", - "reference": "56f2d2a69870031cd0527d63a2ddeb3fbe6f05d3", + "url": "https://api.github.com/repos/cakephp/cakephp/zipball/6a0b9c74710a56c5974d1c8229c7a91dac780402", + "reference": "6a0b9c74710a56c5974d1c8229c7a91dac780402", "shasum": "" }, "require": { @@ -119,7 +120,6 @@ "ext-mbstring": "*", "php": ">=5.6.0", "psr/log": "^1.0.0", - "psr/simple-cache": "^1.0.0", "zendframework/zend-diactoros": "^1.4.0" }, "conflict": { @@ -145,7 +145,6 @@ "phpunit/phpunit": "^5.7.14|^6.0" }, "suggest": { - "ext-curl": "To enable more efficient network calls in Http\\Client.", "ext-openssl": "To use Security::encrypt() or have secure CSRF token generation.", "lib-ICU": "The intl PHP library, to use Text::transliterate() or Text::slug()" }, @@ -184,7 +183,7 @@ "rapid-development", "validation" ], - "time": "2018-12-09T01:19:50+00:00" + "time": "2018-11-04 20:29:27" }, { "name": "cakephp/chronos", @@ -241,7 +240,7 @@ "datetime", "time" ], - "time": "2018-10-18T22:02:21+00:00" + "time": "2018-10-18 22:02:21" }, { "name": "cakephp/migrations", @@ -294,7 +293,7 @@ "cakephp", "migrations" ], - "time": "2018-04-16T01:35:59+00:00" + "time": "2018-04-16 01:35:59" }, { "name": "cakephp/plugin-installer", @@ -335,7 +334,7 @@ } ], "description": "A composer installer for CakePHP 3.0+ plugins.", - "time": "2017-12-24T21:09:29+00:00" + "time": "2017-12-24 21:09:29" }, { "name": "endroid/qrcode", @@ -405,7 +404,7 @@ "symfony" ], "abandoned": "endroid/qr-code", - "time": "2018-05-09T20:26:30+00:00" + "time": "2018-05-09 20:26:30" }, { "name": "fgrosse/phpasn1", @@ -474,7 +473,7 @@ "x509", "x690" ], - "time": "2018-12-02T01:34:34+00:00" + "time": "2018-12-02 01:34:34" }, { "name": "khanamiryan/qrcode-detector-decoder", @@ -524,20 +523,20 @@ "qr", "zxing" ], - "time": "2017-01-13T09:11:46+00:00" + "time": "2017-01-13 09:11:46" }, { "name": "mdanter/ecc", - "version": "v0.5.2", + "version": "v0.5.1", "source": { "type": "git", "url": "https://github.com/phpecc/phpecc.git", - "reference": "b95f25cc1bacc83a9f0ccd375900b7cfd343029e" + "reference": "9a3aca17c6dfc04bdaad2e7ddab3b8df656ffc5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpecc/phpecc/zipball/b95f25cc1bacc83a9f0ccd375900b7cfd343029e", - "reference": "b95f25cc1bacc83a9f0ccd375900b7cfd343029e", + "url": "https://api.github.com/repos/phpecc/phpecc/zipball/9a3aca17c6dfc04bdaad2e7ddab3b8df656ffc5b", + "reference": "9a3aca17c6dfc04bdaad2e7ddab3b8df656ffc5b", "shasum": "" }, "require": { @@ -596,7 +595,7 @@ "secp256k1", "secp256r1" ], - "time": "2018-12-03T18:17:01+00:00" + "time": "2018-12-01 23:35:23" }, { "name": "mobiledetect/mobiledetectlib", @@ -648,7 +647,7 @@ "mobile detector", "php mobile detect" ], - "time": "2018-09-01T15:05:15+00:00" + "time": "2018-09-01 15:05:15" }, { "name": "myclabs/php-enum", @@ -692,7 +691,7 @@ "keywords": [ "enum" ], - "time": "2018-10-30T14:36:18+00:00" + "time": "2018-10-30 14:36:18" }, { "name": "nesbot/carbon", @@ -750,7 +749,7 @@ "datetime", "time" ], - "time": "2018-11-22T18:23:02+00:00" + "time": "2018-11-22 18:23:02" }, { "name": "predis/predis", @@ -800,7 +799,7 @@ "predis", "redis" ], - "time": "2016-06-16T16:22:20+00:00" + "time": "2016-06-16 16:22:20" }, { "name": "psr/http-message", @@ -850,7 +849,7 @@ "request", "response" ], - "time": "2016-08-06T14:39:51+00:00" + "time": "2016-08-06 14:39:51" }, { "name": "psr/log", @@ -897,55 +896,7 @@ "psr", "psr-3" ], - "time": "2018-11-20T15:27:04+00:00" - }, - { - "name": "psr/simple-cache", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/simple-cache.git", - "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", - "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\SimpleCache\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interfaces for simple caching", - "keywords": [ - "cache", - "caching", - "psr", - "psr-16", - "simple-cache" - ], - "time": "2017-10-23T01:57:42+00:00" + "time": "2018-11-20 15:27:04" }, { "name": "robmorgan/phinx", @@ -1011,11 +962,11 @@ "migrations", "phinx" ], - "time": "2017-06-05T13:30:19+00:00" + "time": "2017-06-05 13:30:19" }, { "name": "symfony/config", - "version": "v3.4.20", + "version": "v3.4.19", "source": { "type": "git", "url": "https://github.com/symfony/config.git", @@ -1075,11 +1026,11 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2018-11-26T10:17:44+00:00" + "time": "2018-11-26 10:17:44" }, { "name": "symfony/console", - "version": "v3.4.20", + "version": "v3.4.19", "source": { "type": "git", "url": "https://github.com/symfony/console.git", @@ -1144,20 +1095,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-11-26T12:48:07+00:00" + "time": "2018-11-26 12:48:07" }, { "name": "symfony/contracts", - "version": "v1.0.2", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/symfony/contracts.git", - "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf" + "reference": "3edf0ab943d1985a356721952cba36ff31bd6e5f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/contracts/zipball/1aa7ab2429c3d594dd70689604b5cf7421254cdf", - "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf", + "url": "https://api.github.com/repos/symfony/contracts/zipball/3edf0ab943d1985a356721952cba36ff31bd6e5f", + "reference": "3edf0ab943d1985a356721952cba36ff31bd6e5f", "shasum": "" }, "require": { @@ -1212,11 +1163,11 @@ "interoperability", "standards" ], - "time": "2018-12-05T08:06:11+00:00" + "time": "2018-11-24 09:35:08" }, { "name": "symfony/debug", - "version": "v4.2.1", + "version": "v4.2.0", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", @@ -1268,11 +1219,11 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2018-11-28T18:24:18+00:00" + "time": "2018-11-28 18:24:18" }, { "name": "symfony/filesystem", - "version": "v4.2.1", + "version": "v4.2.0", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", @@ -1318,11 +1269,11 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2018-11-11T19:52:12+00:00" + "time": "2018-11-11 19:52:12" }, { "name": "symfony/options-resolver", - "version": "v2.8.49", + "version": "v2.8.48", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", @@ -1372,7 +1323,7 @@ "configuration", "options" ], - "time": "2018-11-11T11:18:13+00:00" + "time": "2018-11-11 11:18:13" }, { "name": "symfony/polyfill-ctype", @@ -1430,7 +1381,7 @@ "polyfill", "portable" ], - "time": "2018-08-06T14:22:27+00:00" + "time": "2018-08-06 14:22:27" }, { "name": "symfony/polyfill-mbstring", @@ -1489,11 +1440,11 @@ "portable", "shim" ], - "time": "2018-09-21T13:07:52+00:00" + "time": "2018-09-21 13:07:52" }, { "name": "symfony/property-access", - "version": "v2.8.49", + "version": "v2.8.48", "source": { "type": "git", "url": "https://github.com/symfony/property-access.git", @@ -1550,25 +1501,25 @@ "property path", "reflection" ], - "time": "2018-11-11T11:18:13+00:00" + "time": "2018-11-11 11:18:13" }, { "name": "symfony/translation", - "version": "v4.2.1", + "version": "v4.2.0", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "c0e2191e9bed845946ab3d99767513b56ca7dcd6" + "reference": "ff9a878c9b8f8bcd4d9138e2d32f508c942773d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/c0e2191e9bed845946ab3d99767513b56ca7dcd6", - "reference": "c0e2191e9bed845946ab3d99767513b56ca7dcd6", + "url": "https://api.github.com/repos/symfony/translation/zipball/ff9a878c9b8f8bcd4d9138e2d32f508c942773d9", + "reference": "ff9a878c9b8f8bcd4d9138e2d32f508c942773d9", "shasum": "" }, "require": { "php": "^7.1.3", - "symfony/contracts": "^1.0.2", + "symfony/contracts": "^1.0", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { @@ -1623,11 +1574,11 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2018-12-06T10:45:32+00:00" + "time": "2018-11-27 07:20:32" }, { "name": "symfony/yaml", - "version": "v3.4.20", + "version": "v3.4.19", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", @@ -1682,7 +1633,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-11-11T19:48:54+00:00" + "time": "2018-11-11 19:48:54" }, { "name": "zendframework/zend-diactoros", @@ -1746,22 +1697,22 @@ "psr", "psr-7" ], - "time": "2018-09-05T19:29:37+00:00" + "time": "2018-09-05 19:29:37" } ], "packages-dev": [ { "name": "ajgl/breakpoint-twig-extension", - "version": "0.3.2", + "version": "0.3.1", "source": { "type": "git", "url": "https://github.com/ajgarlag/AjglBreakpointTwigExtension.git", - "reference": "bb419d13775d8fb5cd03b31012eaf496b31b444f" + "reference": "360ec6351ad7e1968ee78abb31430046c2e04fc5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ajgarlag/AjglBreakpointTwigExtension/zipball/bb419d13775d8fb5cd03b31012eaf496b31b444f", - "reference": "bb419d13775d8fb5cd03b31012eaf496b31b444f", + "url": "https://api.github.com/repos/ajgarlag/AjglBreakpointTwigExtension/zipball/360ec6351ad7e1968ee78abb31430046c2e04fc5", + "reference": "360ec6351ad7e1968ee78abb31430046c2e04fc5", "shasum": "" }, "require": { @@ -1769,9 +1720,9 @@ "twig/twig": "^1.14|^2.0" }, "require-dev": { - "symfony/framework-bundle": "^2.7|^3.2|^4.1", - "symfony/phpunit-bridge": "^3.4|^4.1", - "symfony/twig-bundle": "^2.7|^3.2|^4.1" + "phpunit/phpunit": "^5", + "symfony/framework-bundle": "^2.7|^3.2", + "symfony/twig-bundle": "^2.7|^3.2" }, "suggest": { "ext-xdebug": "The Xdebug extension is required for the breakpoint to work", @@ -1808,7 +1759,7 @@ "breakpoint", "twig" ], - "time": "2018-12-10T08:22:36+00:00" + "time": "2017-11-20 13:04:11" }, { "name": "aptoma/twig-markdown", @@ -1865,7 +1816,7 @@ "markdown", "twig" ], - "time": "2015-10-23T20:27:08+00:00" + "time": "2015-10-23 20:27:08" }, { "name": "asm89/twig-cache-extension", @@ -1919,24 +1870,24 @@ "extension", "twig" ], - "time": "2017-01-10T22:04:15+00:00" + "time": "2017-01-10 22:04:15" }, { "name": "cakephp/bake", - "version": "1.9.0", + "version": "1.8.6", "source": { "type": "git", "url": "https://github.com/cakephp/bake.git", - "reference": "b69b9200d366634c75d68b2dff1362b16c7a8c1c" + "reference": "bfa552a92a01cb1c878b3a3a67899fcd21569818" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/bake/zipball/b69b9200d366634c75d68b2dff1362b16c7a8c1c", - "reference": "b69b9200d366634c75d68b2dff1362b16c7a8c1c", + "url": "https://api.github.com/repos/cakephp/bake/zipball/bfa552a92a01cb1c878b3a3a67899fcd21569818", + "reference": "bfa552a92a01cb1c878b3a3a67899fcd21569818", "shasum": "" }, "require": { - "cakephp/cakephp": "^3.7.0", + "cakephp/cakephp": "^3.6.12", "cakephp/plugin-installer": "^1.0", "php": ">=5.6.0", "wyrihaximus/twig-view": "^4.3.4" @@ -1967,24 +1918,24 @@ "bake", "cakephp" ], - "time": "2018-12-01T03:00:02+00:00" + "time": "2018-11-17 03:34:24" }, { "name": "cakephp/debug_kit", - "version": "3.17.0", + "version": "3.16.6", "source": { "type": "git", "url": "https://github.com/cakephp/debug_kit.git", - "reference": "6a9023ecc4ac0983c184cedf8e6142ab8ea4a3ff" + "reference": "b6a75d47b2b1be6f6db31fbdf60ed5e062f310db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/debug_kit/zipball/6a9023ecc4ac0983c184cedf8e6142ab8ea4a3ff", - "reference": "6a9023ecc4ac0983c184cedf8e6142ab8ea4a3ff", + "url": "https://api.github.com/repos/cakephp/debug_kit/zipball/b6a75d47b2b1be6f6db31fbdf60ed5e062f310db", + "reference": "b6a75d47b2b1be6f6db31fbdf60ed5e062f310db", "shasum": "" }, "require": { - "cakephp/cakephp": "^3.7.0", + "cakephp/cakephp": "^3.6.0", "cakephp/chronos": "^1.0.0", "cakephp/plugin-installer": "^1.0.0", "composer/composer": "^1.3.0", @@ -2027,7 +1978,7 @@ "debug", "kit" ], - "time": "2018-12-02T03:27:26+00:00" + "time": "2018-11-22 15:19:18" }, { "name": "composer/ca-bundle", @@ -2083,7 +2034,7 @@ "ssl", "tls" ], - "time": "2018-10-18T06:09:13+00:00" + "time": "2018-10-18 06:09:13" }, { "name": "composer/composer", @@ -2163,7 +2114,7 @@ "dependency", "package" ], - "time": "2018-12-03T09:31:16+00:00" + "time": "2018-12-03 09:31:16" }, { "name": "composer/semver", @@ -2225,7 +2176,7 @@ "validation", "versioning" ], - "time": "2016-08-30T16:08:34+00:00" + "time": "2016-08-30 16:08:34" }, { "name": "composer/spdx-licenses", @@ -2286,7 +2237,7 @@ "spdx", "validator" ], - "time": "2018-11-01T09:45:54+00:00" + "time": "2018-11-01 09:45:54" }, { "name": "composer/xdebug-handler", @@ -2330,7 +2281,7 @@ "Xdebug", "performance" ], - "time": "2018-11-29T10:59:02+00:00" + "time": "2018-11-29 10:59:02" }, { "name": "dnoegel/php-xdg-base-dir", @@ -2363,7 +2314,7 @@ "MIT" ], "description": "implementation of xdg base directory specification for php", - "time": "2014-10-24T07:27:01+00:00" + "time": "2014-10-24 07:27:01" }, { "name": "jakub-onderka/php-console-color", @@ -2405,7 +2356,7 @@ "email": "jakub.onderka@gmail.com" } ], - "time": "2018-09-29T17:23:10+00:00" + "time": "2018-09-29 17:23:10" }, { "name": "jakub-onderka/php-console-highlighter", @@ -2451,7 +2402,7 @@ } ], "description": "Highlight PHP code in terminal", - "time": "2018-09-29T18:48:56+00:00" + "time": "2018-09-29 18:48:56" }, { "name": "jasny/twig-extensions", @@ -2511,7 +2462,7 @@ "text", "time" ], - "time": "2017-09-13T07:38:01+00:00" + "time": "2017-09-13 07:38:01" }, { "name": "jdorn/sql-formatter", @@ -2561,7 +2512,7 @@ "highlight", "sql" ], - "time": "2014-01-12T16:20:24+00:00" + "time": "2014-01-12 16:20:24" }, { "name": "justinrainbow/json-schema", @@ -2627,7 +2578,7 @@ "json", "schema" ], - "time": "2018-02-14T22:26:30+00:00" + "time": "2018-02-14 22:26:30" }, { "name": "nikic/php-parser", @@ -2678,7 +2629,7 @@ "parser", "php" ], - "time": "2018-10-10T09:24:14+00:00" + "time": "2018-10-10 09:24:14" }, { "name": "psy/psysh", @@ -2752,7 +2703,7 @@ "interactive", "shell" ], - "time": "2018-10-13T15:16:03+00:00" + "time": "2018-10-13 15:16:03" }, { "name": "seld/jsonlint", @@ -2801,7 +2752,7 @@ "parser", "validator" ], - "time": "2018-01-24T12:46:19+00:00" + "time": "2018-01-24 12:46:19" }, { "name": "seld/phar-utils", @@ -2845,11 +2796,11 @@ "keywords": [ "phra" ], - "time": "2015-10-13T18:44:15+00:00" + "time": "2015-10-13 18:44:15" }, { "name": "symfony/finder", - "version": "v4.2.1", + "version": "v4.2.0", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -2894,7 +2845,7 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2018-11-11T19:52:12+00:00" + "time": "2018-11-11 19:52:12" }, { "name": "symfony/polyfill-php72", @@ -2949,11 +2900,11 @@ "portable", "shim" ], - "time": "2018-09-21T13:07:52+00:00" + "time": "2018-09-21 13:07:52" }, { "name": "symfony/process", - "version": "v4.2.1", + "version": "v4.2.0", "source": { "type": "git", "url": "https://github.com/symfony/process.git", @@ -2998,11 +2949,11 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2018-11-20T16:22:05+00:00" + "time": "2018-11-20 16:22:05" }, { "name": "symfony/var-dumper", - "version": "v4.2.1", + "version": "v4.2.0", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", @@ -3073,7 +3024,7 @@ "debug", "dump" ], - "time": "2018-11-25T12:50:42+00:00" + "time": "2018-11-25 12:50:42" }, { "name": "twig/twig", @@ -3139,7 +3090,7 @@ "keywords": [ "templating" ], - "time": "2018-07-13T07:12:17+00:00" + "time": "2018-07-13 07:12:17" }, { "name": "umpirsky/twig-php-function", @@ -3180,27 +3131,27 @@ } ], "description": "Call (almost) any PHP function from your Twig templates.", - "time": "2016-03-12T16:36:32+00:00" + "time": "2016-03-12 16:36:32" }, { "name": "wyrihaximus/twig-view", - "version": "4.3.7", + "version": "4.3.5", "source": { "type": "git", "url": "https://github.com/WyriHaximus/TwigView.git", - "reference": "54d69c1fd36897120a7e0a9301f95adb93aa929d" + "reference": "ec2771e6a1fe799f9b16eff19da424cd04d593b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WyriHaximus/TwigView/zipball/54d69c1fd36897120a7e0a9301f95adb93aa929d", - "reference": "54d69c1fd36897120a7e0a9301f95adb93aa929d", + "url": "https://api.github.com/repos/WyriHaximus/TwigView/zipball/ec2771e6a1fe799f9b16eff19da424cd04d593b7", + "reference": "ec2771e6a1fe799f9b16eff19da424cd04d593b7", "shasum": "" }, "require": { "ajgl/breakpoint-twig-extension": "^0.3.0", "aptoma/twig-markdown": "^2.0", "asm89/twig-cache-extension": "^1.0", - "cakephp/cakephp": "^3.6", + "cakephp/cakephp": "^3.5", "jasny/twig-extensions": "^1.0", "php": "^5.6 || ^7.0", "twig/twig": "^1.27", @@ -3238,7 +3189,7 @@ "twig", "view" ], - "time": "2018-12-11T07:04:21+00:00" + "time": "2018-07-03 15:46:29" } ], "aliases": [], -- 2.45.2