From c161f065ef74cea19a1f065f13f4858bfd032367 Mon Sep 17 00:00:00 2001 From: trendschau Date: Sun, 13 Jun 2021 18:43:11 +0200 Subject: [PATCH] Version 1.4.6 add version number and fingerprint assets --- composer.lock | 135 +++++++++++++++++++----- system/Settings.php | 2 +- system/author/layouts/layout.twig | 16 +-- system/author/layouts/layoutAuth.twig | 4 +- system/author/layouts/layoutBlank.twig | 2 +- system/author/layouts/layoutBlox.twig | 30 +++--- system/author/layouts/layoutEditor.twig | 22 ++-- themes/cyanine/layout.twig | 2 +- 8 files changed, 150 insertions(+), 63 deletions(-) diff --git a/composer.lock b/composer.lock index 36855c4..dfec92e 100644 --- a/composer.lock +++ b/composer.lock @@ -53,6 +53,10 @@ "middleware", "psr7" ], + "support": { + "issues": "https://github.com/akrabat/proxy-detection-middleware/issues", + "source": "https://github.com/akrabat/proxy-detection-middleware/tree/master" + }, "time": "2018-09-11T10:28:26+00:00" }, { @@ -99,6 +103,10 @@ "markdown", "parser" ], + "support": { + "issues": "https://github.com/erusev/parsedown/issues", + "source": "https://github.com/erusev/parsedown/tree/1.8.0-beta-7" + }, "time": "2019-03-17T18:47:21+00:00" }, { @@ -124,6 +132,7 @@ "require-dev": { "phpunit/phpunit": "^4.8.35" }, + "default-branch": true, "type": "library", "autoload": { "psr-0": { @@ -149,6 +158,10 @@ "parsedown", "parser" ], + "support": { + "issues": "https://github.com/erusev/parsedown-extra/issues", + "source": "https://github.com/erusev/parsedown-extra/tree/0.8.0" + }, "time": "2019-12-29T11:14:16+00:00" }, { @@ -206,33 +219,40 @@ "url", "urlify" ], + "support": { + "issues": "https://github.com/jbroadway/urlify/issues", + "source": "https://github.com/jbroadway/urlify/tree/1.1.3-stable" + }, "time": "2019-06-13T18:30:56+00:00" }, { "name": "laminas/laminas-permissions-acl", - "version": "2.7.2", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-permissions-acl.git", - "reference": "d8cd35ed94eef5d3d2533af4a72cf1c2932084bb" + "reference": "7af6463695d76dbf25c6b03e6ebb792c8f1ab67e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-permissions-acl/zipball/d8cd35ed94eef5d3d2533af4a72cf1c2932084bb", - "reference": "d8cd35ed94eef5d3d2533af4a72cf1c2932084bb", + "url": "https://api.github.com/repos/laminas/laminas-permissions-acl/zipball/7af6463695d76dbf25c6b03e6ebb792c8f1ab67e", + "reference": "7af6463695d76dbf25c6b03e6ebb792c8f1ab67e", "shasum": "" }, "require": { "laminas/laminas-zendframework-bridge": "^1.0", - "php": "^5.6 || ^7.0" + "php": "^7.3 || ~8.0.0" + }, + "conflict": { + "laminas/laminas-servicemanager": "<3.0" }, "replace": { "zendframework/zend-permissions-acl": "^2.7.1" }, "require-dev": { "laminas/laminas-coding-standard": "~1.0.0", - "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3", - "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5" + "laminas/laminas-servicemanager": "^3.0.3", + "phpunit/phpunit": "^9.5" }, "suggest": { "laminas/laminas-servicemanager": "To support Laminas\\Permissions\\Acl\\Assertion\\AssertionManager plugin manager usage" @@ -253,13 +273,21 @@ "acl", "laminas" ], + "support": { + "chat": "https://laminas.dev/chat", + "docs": "https://docs.laminas.dev/laminas-permissions-acl/", + "forum": "https://discourse.laminas.dev", + "issues": "https://github.com/laminas/laminas-permissions-acl/issues", + "rss": "https://github.com/laminas/laminas-permissions-acl/releases.atom", + "source": "https://github.com/laminas/laminas-permissions-acl" + }, "funding": [ { "url": "https://funding.communitybridge.org/projects/laminas-project", "type": "community_bridge" } ], - "time": "2020-09-22T14:08:17+00:00" + "time": "2021-04-08T12:56:14+00:00" }, { "name": "laminas/laminas-zendframework-bridge", @@ -309,6 +337,12 @@ "laminas", "zf" ], + "support": { + "forum": "https://discourse.laminas.dev/", + "issues": "https://github.com/laminas/laminas-zendframework-bridge/issues", + "rss": "https://github.com/laminas/laminas-zendframework-bridge/releases.atom", + "source": "https://github.com/laminas/laminas-zendframework-bridge" + }, "funding": [ { "url": "https://funding.communitybridge.org/projects/laminas-project", @@ -361,6 +395,10 @@ "router", "routing" ], + "support": { + "issues": "https://github.com/nikic/FastRoute/issues", + "source": "https://github.com/nikic/FastRoute/tree/master" + }, "time": "2018-02-13T20:26:39+00:00" }, { @@ -406,6 +444,11 @@ "pseudorandom", "random" ], + "support": { + "email": "info@paragonie.com", + "issues": "https://github.com/paragonie/random_compat/issues", + "source": "https://github.com/paragonie/random_compat" + }, "time": "2020-10-15T08:29:30+00:00" }, { @@ -456,6 +499,9 @@ "container", "dependency injection" ], + "support": { + "source": "https://github.com/silexphp/Pimple/tree/v3.4.0" + }, "time": "2021-03-06T08:28:00+00:00" }, { @@ -500,6 +546,10 @@ "container-interop", "psr" ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/1.1.1" + }, "time": "2021-03-05T17:36:06+00:00" }, { @@ -550,6 +600,9 @@ "request", "response" ], + "support": { + "source": "https://github.com/php-fig/http-message/tree/master" + }, "time": "2016-08-06T14:39:51+00:00" }, { @@ -600,6 +653,10 @@ "middleware", "slim" ], + "support": { + "issues": "https://github.com/slimphp/Slim-Csrf/issues", + "source": "https://github.com/slimphp/Slim-Csrf/tree/master" + }, "time": "2018-08-22T16:12:18+00:00" }, { @@ -648,6 +705,10 @@ "provider", "slim" ], + "support": { + "issues": "https://github.com/slimphp/Slim-Flash/issues", + "source": "https://github.com/slimphp/Slim-Flash/tree/master" + }, "time": "2017-10-22T10:35:05+00:00" }, { @@ -721,6 +782,10 @@ "micro", "router" ], + "support": { + "issues": "https://github.com/slimphp/Slim/issues", + "source": "https://github.com/slimphp/Slim/tree/3.x" + }, "time": "2019-11-28T17:40:33+00:00" }, { @@ -772,6 +837,10 @@ "twig", "view" ], + "support": { + "issues": "https://github.com/slimphp/Twig-View/issues", + "source": "https://github.com/slimphp/Twig-View/tree/master" + }, "time": "2019-11-28T18:03:50+00:00" }, { @@ -831,6 +900,9 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/event-dispatcher/tree/v3.4.47" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -849,16 +921,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "c6c942b1ac76c82448322025e084cadc56048b4e" + "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e", - "reference": "c6c942b1ac76c82448322025e084cadc56048b4e", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce", + "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce", "shasum": "" }, "require": { @@ -870,7 +942,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -907,6 +979,9 @@ "polyfill", "portable" ], + "support": { + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -921,7 +996,7 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/yaml", @@ -971,20 +1046,23 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/yaml/tree/v2.8.52" + }, "time": "2018-11-11T11:18:13+00:00" }, { "name": "twig/twig", - "version": "v1.44.2", + "version": "v1.44.4", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "138c493c5b8ee7cff3821f80b8896d371366b5fe" + "reference": "4d400421528e9fa40caaffcf7824c172526dd99d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/138c493c5b8ee7cff3821f80b8896d371366b5fe", - "reference": "138c493c5b8ee7cff3821f80b8896d371366b5fe", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/4d400421528e9fa40caaffcf7824c172526dd99d", + "reference": "4d400421528e9fa40caaffcf7824c172526dd99d", "shasum": "" }, "require": { @@ -1035,6 +1113,10 @@ "keywords": [ "templating" ], + "support": { + "issues": "https://github.com/twigphp/Twig/issues", + "source": "https://github.com/twigphp/Twig/tree/v1.44.4" + }, "funding": [ { "url": "https://github.com/fabpot", @@ -1045,7 +1127,7 @@ "type": "tidelift" } ], - "time": "2021-01-05T10:10:05+00:00" + "time": "2021-05-16T12:11:20+00:00" }, { "name": "vlucas/valitron", @@ -1053,12 +1135,12 @@ "source": { "type": "git", "url": "https://github.com/vlucas/valitron.git", - "reference": "81515dcc951e1f636a1a18ece2f4154dfa123438" + "reference": "f7e662e3c0c1c465d548542672e08862fbb601d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/valitron/zipball/81515dcc951e1f636a1a18ece2f4154dfa123438", - "reference": "81515dcc951e1f636a1a18ece2f4154dfa123438", + "url": "https://api.github.com/repos/vlucas/valitron/zipball/f7e662e3c0c1c465d548542672e08862fbb601d9", + "reference": "f7e662e3c0c1c465d548542672e08862fbb601d9", "shasum": "" }, "require": { @@ -1070,6 +1152,7 @@ "suggest": { "ext-mbstring": "It can support the multiple bytes string length." }, + "default-branch": true, "type": "library", "autoload": { "psr-4": { @@ -1094,13 +1177,17 @@ "validation", "validator" ], + "support": { + "issues": "https://github.com/vlucas/valitron/issues", + "source": "https://github.com/vlucas/valitron/tree/master" + }, "funding": [ { "url": "https://tidelift.com/funding/github/packagist/vlucas/valitron", "type": "tidelift" } ], - "time": "2020-12-01T11:14:45+00:00" + "time": "2021-05-12T19:47:47+00:00" } ], "packages-dev": [], @@ -1114,5 +1201,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "1.1.0" + "plugin-api-version": "2.0.0" } diff --git a/system/Settings.php b/system/Settings.php index 2783eb4..2e13265 100644 --- a/system/Settings.php +++ b/system/Settings.php @@ -84,7 +84,7 @@ class Settings 'editor' => 'visual', 'formats' => ['markdown', 'headline', 'ulist', 'olist', 'table', 'quote', 'notice', 'image', 'video', 'file', 'toc', 'hr', 'definition', 'code'], 'contentFolder' => 'content', - 'version' => '1.4.5', + 'version' => '1.4.6', 'setup' => true, 'welcome' => true, 'images' => ['live' => ['width' => 820], 'thumbs' => ['width' => 250, 'height' => 150]], diff --git a/system/author/layouts/layout.twig b/system/author/layouts/layout.twig index e5125a0..495be40 100644 --- a/system/author/layouts/layout.twig +++ b/system/author/layouts/layout.twig @@ -16,8 +16,8 @@ - - + + {{ assets.renderCSS() }} @@ -39,16 +39,16 @@ - + - - - - - + + + + + diff --git a/system/author/layouts/layoutAuth.twig b/system/author/layouts/layoutAuth.twig index 2f5afe7..0b599bb 100644 --- a/system/author/layouts/layoutAuth.twig +++ b/system/author/layouts/layoutAuth.twig @@ -17,7 +17,7 @@ - + {{ assets.renderCSS() }} @@ -31,6 +31,6 @@ {% block content %}{% endblock %} - + \ No newline at end of file diff --git a/system/author/layouts/layoutBlank.twig b/system/author/layouts/layoutBlank.twig index 42e575e..17905c1 100644 --- a/system/author/layouts/layoutBlank.twig +++ b/system/author/layouts/layoutBlank.twig @@ -16,7 +16,7 @@ - + diff --git a/system/author/layouts/layoutBlox.twig b/system/author/layouts/layoutBlox.twig index 8066011..8c951a2 100644 --- a/system/author/layouts/layoutBlox.twig +++ b/system/author/layouts/layoutBlox.twig @@ -17,7 +17,7 @@ - + {{ assets.renderCSS() }} @@ -41,17 +41,17 @@ - + - - - - - - + + + + + + - - - - - - + + + + + + + {{ assets.renderJS() }} diff --git a/system/author/layouts/layoutEditor.twig b/system/author/layouts/layoutEditor.twig index bcd76ad..840f197 100644 --- a/system/author/layouts/layoutEditor.twig +++ b/system/author/layouts/layoutEditor.twig @@ -17,7 +17,7 @@ - + {{ assets.renderCSS() }} @@ -41,15 +41,15 @@ - + - - - - + + + + - - - - + + + + + {{ assets.renderJS() }} diff --git a/themes/cyanine/layout.twig b/themes/cyanine/layout.twig index ec2f0aa..a0d5360 100644 --- a/themes/cyanine/layout.twig +++ b/themes/cyanine/layout.twig @@ -36,7 +36,7 @@ {% block stylesheets %} - +