diff --git a/CHANGELOG.md b/CHANGELOG.md index 108eece..f9581c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## v.3.1 (WIP) ++ Updated translations + ## v.3.0.2 + Fixed error with migrate command. + Updated translations. diff --git a/Gruntfile.js b/Gruntfile.js index 7c1de23..ea0939e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -101,6 +101,18 @@ module.exports = function (grunt) { src: ['dropzone.min.css', 'dropzone.min.js'], dest: 'static/dropzone' }, + { + expand: true, + cwd: 'node_modules/bootstrap4-toggle/css', + src: ['bootstrap4-toggle.min.css'], + dest: 'static/bootstrap/css' + }, + { + expand: true, + cwd: 'node_modules/bootstrap4-toggle/js', + src: ['bootstrap4-toggle.min.js'], + dest: 'static/bootstrap/js' + }, { expand: true, cwd: 'src/images', diff --git a/app/Controllers/AdminController.php b/app/Controllers/AdminController.php index d1fdf8c..b2a1d09 100644 --- a/app/Controllers/AdminController.php +++ b/app/Controllers/AdminController.php @@ -43,6 +43,7 @@ class AdminController extends Controller 'upload_max_filesize' => ini_get('upload_max_filesize'), 'installed_lang' => $this->lang->getList(), 'forced_lang' => $request->getAttribute('forced_lang'), + 'php_version' => phpversion(), ]); } diff --git a/app/Controllers/MediaController.php b/app/Controllers/MediaController.php index cb28f08..e30e51f 100644 --- a/app/Controllers/MediaController.php +++ b/app/Controllers/MediaController.php @@ -120,6 +120,12 @@ class MediaController extends Controller throw new HttpBadRequestException($request); } + // If contains html, return it as text/plain + if (strpos($this->storage->getMimetype($media->storage_path), 'text/htm') !== false) { + $response = $this->streamMedia($request, $response, $this->storage, $media); + return $response->withHeader('Content-Type', 'text/plain'); + } + return $this->streamMedia($request, $response, $this->storage, $media); } @@ -358,7 +364,7 @@ class MediaController extends Controller protected function handlePartialRequest(Response $response, Stream $stream, string $range, string $disposition, $media, $mime) { $end = $stream->getSize() - 1; - list(, $range) = explode('=', $range, 2); + [, $range] = explode('=', $range, 2); if (strpos($range, ',') !== false) { return $response->withHeader('Content-Type', $mime) diff --git a/app/Controllers/SettingController.php b/app/Controllers/SettingController.php new file mode 100644 index 0000000..3bcb1f3 --- /dev/null +++ b/app/Controllers/SettingController.php @@ -0,0 +1,10 @@ +=5.5" }, "require-dev": { @@ -88,7 +88,7 @@ "s3", "sdk" ], - "time": "2019-12-04T01:40:14+00:00" + "time": "2020-02-24T19:15:07+00:00" }, { "name": "firebase/php-jwt", @@ -138,16 +138,16 @@ }, { "name": "google/auth", - "version": "v1.6.1", + "version": "v1.7.1", "source": { "type": "git", "url": "https://github.com/googleapis/google-auth-library-php.git", - "reference": "45635ac69d0b95f38885531d4ebcdfcb2ebb6f36" + "reference": "39e243a7d8320b1889ab8bb4cd6f98f7af83c582" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/45635ac69d0b95f38885531d4ebcdfcb2ebb6f36", - "reference": "45635ac69d0b95f38885531d4ebcdfcb2ebb6f36", + "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/39e243a7d8320b1889ab8bb4cd6f98f7af83c582", + "reference": "39e243a7d8320b1889ab8bb4cd6f98f7af83c582", "shasum": "" }, "require": { @@ -161,6 +161,7 @@ "require-dev": { "friendsofphp/php-cs-fixer": "^1.11", "guzzlehttp/promises": "0.1.1|^1.3", + "kelvinmo/simplejwt": "^0.2.5", "phpseclib/phpseclib": "^2", "phpunit/phpunit": "^4.8.36|^5.7", "sebastian/comparator": ">=1.2.3" @@ -185,20 +186,20 @@ "google", "oauth2" ], - "time": "2019-10-29T20:13:04+00:00" + "time": "2020-02-12T20:54:50+00:00" }, { "name": "google/cloud-core", - "version": "v1.34.0", + "version": "v1.35.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-cloud-php-core.git", - "reference": "52db21acb2da25d2d79e493842de58da7836c97f" + "reference": "e24a49fb1df51d6cff38c97450feffae82661c2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/52db21acb2da25d2d79e493842de58da7836c97f", - "reference": "52db21acb2da25d2d79e493842de58da7836c97f", + "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/e24a49fb1df51d6cff38c97450feffae82661c2d", + "reference": "e24a49fb1df51d6cff38c97450feffae82661c2d", "shasum": "" }, "require": { @@ -246,24 +247,24 @@ "Apache-2.0" ], "description": "Google Cloud PHP shared dependency, providing functionality useful to all components.", - "time": "2019-10-28T19:05:44+00:00" + "time": "2020-02-11T23:07:13+00:00" }, { "name": "google/cloud-storage", - "version": "v1.16.0", + "version": "v1.18.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-cloud-php-storage.git", - "reference": "308ad790b257286e02777e3bf1a2c0473a4651a7" + "reference": "201b69aa6f24b60718dc0bd0c1bdc6963ade0e99" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/308ad790b257286e02777e3bf1a2c0473a4651a7", - "reference": "308ad790b257286e02777e3bf1a2c0473a4651a7", + "url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/201b69aa6f24b60718dc0bd0c1bdc6963ade0e99", + "reference": "201b69aa6f24b60718dc0bd0c1bdc6963ade0e99", "shasum": "" }, "require": { - "google/cloud-core": "^1.31", + "google/cloud-core": "^1.35", "google/crc32": "^0.1.0" }, "require-dev": { @@ -297,7 +298,7 @@ "Apache-2.0" ], "description": "Cloud Storage Client for PHP", - "time": "2019-11-12T23:35:42+00:00" + "time": "2020-02-11T23:07:13+00:00" }, { "name": "google/crc32", @@ -397,16 +398,16 @@ }, { "name": "guzzlehttp/guzzle", - "version": "6.4.1", + "version": "6.5.2", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "0895c932405407fd3a7368b6910c09a24d26db11" + "reference": "43ece0e75098b7ecd8d13918293029e555a50f82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/0895c932405407fd3a7368b6910c09a24d26db11", - "reference": "0895c932405407fd3a7368b6910c09a24d26db11", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/43ece0e75098b7ecd8d13918293029e555a50f82", + "reference": "43ece0e75098b7ecd8d13918293029e555a50f82", "shasum": "" }, "require": { @@ -421,12 +422,13 @@ "psr/log": "^1.1" }, "suggest": { + "ext-intl": "Required for Internationalized Domain Name (IDN) support", "psr/log": "Required for using the Log middleware" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "6.3-dev" + "dev-master": "6.5-dev" } }, "autoload": { @@ -459,7 +461,7 @@ "rest", "web service" ], - "time": "2019-10-23T15:58:00+00:00" + "time": "2019-12-23T11:57:10+00:00" }, { "name": "guzzlehttp/promises", @@ -763,16 +765,16 @@ }, { "name": "league/flysystem", - "version": "1.0.57", + "version": "1.0.64", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a" + "reference": "d13c43dbd4b791f815215959105a008515d1a2e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a", - "reference": "0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/d13c43dbd4b791f815215959105a008515d1a2e0", + "reference": "d13c43dbd4b791f815215959105a008515d1a2e0", "shasum": "" }, "require": { @@ -784,7 +786,7 @@ }, "require-dev": { "phpspec/phpspec": "^3.4", - "phpunit/phpunit": "^5.7.10" + "phpunit/phpunit": "^5.7.26" }, "suggest": { "ext-fileinfo": "Required for MimeType", @@ -843,20 +845,20 @@ "sftp", "storage" ], - "time": "2019-10-16T21:01:05+00:00" + "time": "2020-02-05T18:14:17+00:00" }, { "name": "league/flysystem-aws-s3-v3", - "version": "1.0.23", + "version": "1.0.24", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git", - "reference": "15b0cdeab7240bf8e8bffa85ae5275bbc3692bf4" + "reference": "4382036bde5dc926f9b8b337e5bdb15e5ec7b570" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/15b0cdeab7240bf8e8bffa85ae5275bbc3692bf4", - "reference": "15b0cdeab7240bf8e8bffa85ae5275bbc3692bf4", + "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/4382036bde5dc926f9b8b337e5bdb15e5ec7b570", + "reference": "4382036bde5dc926f9b8b337e5bdb15e5ec7b570", "shasum": "" }, "require": { @@ -890,20 +892,20 @@ } ], "description": "Flysystem adapter for the AWS S3 SDK v3.x", - "time": "2019-06-05T17:18:29+00:00" + "time": "2020-02-23T13:31:58+00:00" }, { "name": "monolog/monolog", - "version": "1.25.2", + "version": "1.25.3", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "d5e2fb341cb44f7e2ab639d12a1e5901091ec287" + "reference": "fa82921994db851a8becaf3787a9e73c5976b6f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/d5e2fb341cb44f7e2ab639d12a1e5901091ec287", - "reference": "d5e2fb341cb44f7e2ab639d12a1e5901091ec287", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fa82921994db851a8becaf3787a9e73c5976b6f1", + "reference": "fa82921994db851a8becaf3787a9e73c5976b6f1", "shasum": "" }, "require": { @@ -968,27 +970,29 @@ "logging", "psr-3" ], - "time": "2019-11-13T10:00:05+00:00" + "time": "2019-12-20T14:15:16+00:00" }, { "name": "mtdowling/jmespath.php", - "version": "2.4.0", + "version": "2.5.0", "source": { "type": "git", "url": "https://github.com/jmespath/jmespath.php.git", - "reference": "adcc9531682cf87dfda21e1fd5d0e7a41d292fac" + "reference": "52168cb9472de06979613d365c7f1ab8798be895" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/adcc9531682cf87dfda21e1fd5d0e7a41d292fac", - "reference": "adcc9531682cf87dfda21e1fd5d0e7a41d292fac", + "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/52168cb9472de06979613d365c7f1ab8798be895", + "reference": "52168cb9472de06979613d365c7f1ab8798be895", "shasum": "" }, "require": { - "php": ">=5.4.0" + "php": ">=5.4.0", + "symfony/polyfill-mbstring": "^1.4" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "composer/xdebug-handler": "^1.2", + "phpunit/phpunit": "^4.8.36|^7.5.15" }, "bin": [ "bin/jp.php" @@ -996,7 +1000,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "2.5-dev" } }, "autoload": { @@ -1023,7 +1027,7 @@ "json", "jsonpath" ], - "time": "2016-12-03T22:08:25+00:00" + "time": "2019-12-30T18:03:34+00:00" }, { "name": "nikic/fast-route", @@ -1168,16 +1172,16 @@ }, { "name": "php-di/php-di", - "version": "6.0.10", + "version": "6.0.11", "source": { "type": "git", "url": "https://github.com/PHP-DI/PHP-DI.git", - "reference": "a6c813bf6b0d0bdeade3ac5a920e2c2a5b1a6ce3" + "reference": "9bdcc2f41f5fb700ddd01bc4fa8d5bd7b3f94620" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/a6c813bf6b0d0bdeade3ac5a920e2c2a5b1a6ce3", - "reference": "a6c813bf6b0d0bdeade3ac5a920e2c2a5b1a6ce3", + "url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/9bdcc2f41f5fb700ddd01bc4fa8d5bd7b3f94620", + "reference": "9bdcc2f41f5fb700ddd01bc4fa8d5bd7b3f94620", "shasum": "" }, "require": { @@ -1227,7 +1231,7 @@ "ioc", "psr11" ], - "time": "2019-10-21T11:58:24+00:00" + "time": "2019-12-12T07:58:02+00:00" }, { "name": "php-di/phpdoc-reader", @@ -1268,16 +1272,16 @@ }, { "name": "php-di/slim-bridge", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/PHP-DI/Slim-Bridge.git", - "reference": "3249b0da05550a5d8a393c9e27ded1133f9006ea" + "reference": "e7a568c00ecf6b0128f2a751990e06e77bedec68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-DI/Slim-Bridge/zipball/3249b0da05550a5d8a393c9e27ded1133f9006ea", - "reference": "3249b0da05550a5d8a393c9e27ded1133f9006ea", + "url": "https://api.github.com/repos/PHP-DI/Slim-Bridge/zipball/e7a568c00ecf6b0128f2a751990e06e77bedec68", + "reference": "e7a568c00ecf6b0128f2a751990e06e77bedec68", "shasum": "" }, "require": { @@ -1301,7 +1305,7 @@ "MIT" ], "description": "PHP-DI integration in Slim", - "time": "2019-09-08T20:19:58+00:00" + "time": "2020-01-13T19:11:12+00:00" }, { "name": "psr/cache", @@ -1739,22 +1743,22 @@ }, { "name": "slim/slim", - "version": "4.3.0", + "version": "4.4.0", "source": { "type": "git", "url": "https://github.com/slimphp/Slim.git", - "reference": "26020e9a099e69b0b12918115894f7106364dcb7" + "reference": "207acac048652a35d4762a737d59e317aedc02df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slimphp/Slim/zipball/26020e9a099e69b0b12918115894f7106364dcb7", - "reference": "26020e9a099e69b0b12918115894f7106364dcb7", + "url": "https://api.github.com/repos/slimphp/Slim/zipball/207acac048652a35d4762a737d59e317aedc02df", + "reference": "207acac048652a35d4762a737d59e317aedc02df", "shasum": "" }, "require": { "ext-json": "*", "nikic/fast-route": "^1.3", - "php": "^7.1", + "php": "^7.2", "psr/container": "^1.0", "psr/http-factory": "^1.0", "psr/http-message": "^1.0", @@ -1762,29 +1766,30 @@ "psr/http-server-middleware": "^1.0" }, "require-dev": { + "adriansuter/php-autoload-override": "^1.0", "ext-simplexml": "*", "guzzlehttp/psr7": "^1.5", "http-interop/http-factory-guzzle": "^1.0", + "laminas/laminas-diactoros": "^2.1", "nyholm/psr7": "^1.1", "nyholm/psr7-server": "^0.3.0", - "phpspec/prophecy": "^1.8", + "phpspec/prophecy": "^1.10", "phpstan/phpstan": "^0.11.5", - "phpunit/phpunit": "^7.5", + "phpunit/phpunit": "^8.5", "slim/http": "^0.7", "slim/psr7": "^0.3", - "squizlabs/php_codesniffer": "^3.4.2", - "zendframework/zend-diactoros": "^2.1" + "squizlabs/php_codesniffer": "^3.5" }, "suggest": { "ext-simplexml": "Needed to support XML format in BodyParsingMiddleware", "ext-xml": "Needed to support XML format in BodyParsingMiddleware", - "slim/psr7": "Slim PSR-7 implementation. See http://www.slimframework.com/docs/v4/start/installation.html for more information." + "php-di/php-di": "PHP-DI is the recommended container library to be used with Slim", + "slim/psr7": "Slim PSR-7 implementation. See https://www.slimframework.com/docs/v4/start/installation.html for more information." }, "type": "library", "autoload": { "psr-4": { - "Slim\\": "Slim", - "Slim\\Tests\\": "tests" + "Slim\\": "Slim" } }, "notification-url": "https://packagist.org/downloads/", @@ -1826,20 +1831,20 @@ "micro", "router" ], - "time": "2019-10-05T21:24:58+00:00" + "time": "2020-01-05T03:51:47+00:00" }, { "name": "spatie/dropbox-api", - "version": "1.11.0", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/spatie/dropbox-api.git", - "reference": "47c6a14bcdc639ba90f86f98b2ada38ac9cc8e30" + "reference": "f599374697e7fefa2b0d64ca25ad7079abf91970" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/dropbox-api/zipball/47c6a14bcdc639ba90f86f98b2ada38ac9cc8e30", - "reference": "47c6a14bcdc639ba90f86f98b2ada38ac9cc8e30", + "url": "https://api.github.com/repos/spatie/dropbox-api/zipball/f599374697e7fefa2b0d64ca25ad7079abf91970", + "reference": "f599374697e7fefa2b0d64ca25ad7079abf91970", "shasum": "" }, "require": { @@ -1848,7 +1853,7 @@ "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^7.5.15|^8.5" }, "type": "library", "autoload": { @@ -1862,14 +1867,14 @@ ], "authors": [ { - "name": "Freek Van der Herten", - "email": "freek@spatie.be", + "name": "Alex Vanderbist", + "email": "alex.vanderbist@gmail.com", "homepage": "https://spatie.be", "role": "Developer" }, { - "name": "Alex Vanderbist", - "email": "alex.vanderbist@gmail.com", + "name": "Freek Van der Herten", + "email": "freek@spatie.be", "homepage": "https://spatie.be", "role": "Developer" } @@ -1883,7 +1888,7 @@ "spatie", "v2" ], - "time": "2019-07-04T19:04:14+00:00" + "time": "2020-02-04T07:32:05+00:00" }, { "name": "spatie/flysystem-dropbox", @@ -1986,16 +1991,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.13.1", + "version": "v1.14.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3" + "reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", - "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/fbdeaec0df06cf3d51c93de80c7eb76e271f5a38", + "reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38", "shasum": "" }, "require": { @@ -2007,7 +2012,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.14-dev" } }, "autoload": { @@ -2040,20 +2045,20 @@ "polyfill", "portable" ], - "time": "2019-11-27T13:56:44+00:00" + "time": "2020-01-13T11:15:53+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.13.1", + "version": "v1.14.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f" + "reference": "34094cfa9abe1f0f14f48f490772db7a775559f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f", - "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/34094cfa9abe1f0f14f48f490772db7a775559f2", + "reference": "34094cfa9abe1f0f14f48f490772db7a775559f2", "shasum": "" }, "require": { @@ -2065,7 +2070,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.14-dev" } }, "autoload": { @@ -2099,20 +2104,20 @@ "portable", "shim" ], - "time": "2019-11-27T14:18:11+00:00" + "time": "2020-01-13T11:15:53+00:00" }, { "name": "symfony/polyfill-php56", - "version": "v1.13.1", + "version": "v1.14.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "53dd1cdf3cb986893ccf2b96665b25b3abb384f4" + "reference": "16ec91cb06998b609501b55b7177b7d7c02badb3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/53dd1cdf3cb986893ccf2b96665b25b3abb384f4", - "reference": "53dd1cdf3cb986893ccf2b96665b25b3abb384f4", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/16ec91cb06998b609501b55b7177b7d7c02badb3", + "reference": "16ec91cb06998b609501b55b7177b7d7c02badb3", "shasum": "" }, "require": { @@ -2122,7 +2127,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.14-dev" } }, "autoload": { @@ -2155,20 +2160,20 @@ "portable", "shim" ], - "time": "2019-11-27T13:56:44+00:00" + "time": "2020-01-13T11:15:53+00:00" }, { "name": "symfony/polyfill-util", - "version": "v1.13.1", + "version": "v1.14.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", - "reference": "964a67f293b66b95883a5ed918a65354fcd2258f" + "reference": "ba3cfcea6d0192cae46c62041f61cbb704b526d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/964a67f293b66b95883a5ed918a65354fcd2258f", - "reference": "964a67f293b66b95883a5ed918a65354fcd2258f", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/ba3cfcea6d0192cae46c62041f61cbb704b526d3", + "reference": "ba3cfcea6d0192cae46c62041f61cbb704b526d3", "shasum": "" }, "require": { @@ -2177,7 +2182,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.14-dev" } }, "autoload": { @@ -2207,20 +2212,20 @@ "polyfill", "shim" ], - "time": "2019-11-27T13:56:44+00:00" + "time": "2020-01-13T11:15:53+00:00" }, { "name": "twig/twig", - "version": "v2.12.2", + "version": "v2.12.5", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "d761fd1f1c6b867ae09a7d8119a6d95d06dc44ed" + "reference": "18772e0190734944277ee97a02a9a6c6555fcd94" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/d761fd1f1c6b867ae09a7d8119a6d95d06dc44ed", - "reference": "d761fd1f1c6b867ae09a7d8119a6d95d06dc44ed", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/18772e0190734944277ee97a02a9a6c6555fcd94", + "reference": "18772e0190734944277ee97a02a9a6c6555fcd94", "shasum": "" }, "require": { @@ -2230,8 +2235,7 @@ }, "require-dev": { "psr/container": "^1.0", - "symfony/debug": "^3.4|^4.2", - "symfony/phpunit-bridge": "^4.4@dev|^5.0" + "symfony/phpunit-bridge": "^4.4|^5.0" }, "type": "library", "extra": { @@ -2260,7 +2264,6 @@ }, { "name": "Twig Team", - "homepage": "https://twig.symfony.com/contributors", "role": "Contributors" }, { @@ -2274,7 +2277,7 @@ "keywords": [ "templating" ], - "time": "2019-11-11T16:52:09+00:00" + "time": "2020-02-11T15:31:23+00:00" } ], "packages-dev": [ @@ -2451,25 +2454,25 @@ }, { "name": "nette/di", - "version": "v3.0.1", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/nette/di.git", - "reference": "4aff517a1c6bb5c36fa09733d4cea089f529de6d" + "reference": "77d69061cbf8f9cfb7363dd983136f51213d3e41" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/di/zipball/4aff517a1c6bb5c36fa09733d4cea089f529de6d", - "reference": "4aff517a1c6bb5c36fa09733d4cea089f529de6d", + "url": "https://api.github.com/repos/nette/di/zipball/77d69061cbf8f9cfb7363dd983136f51213d3e41", + "reference": "77d69061cbf8f9cfb7363dd983136f51213d3e41", "shasum": "" }, "require": { "ext-tokenizer": "*", "nette/neon": "^3.0", - "nette/php-generator": "^3.2.2", + "nette/php-generator": "^3.3.3", "nette/robot-loader": "^3.2", "nette/schema": "^1.0", - "nette/utils": "^3.0", + "nette/utils": "^3.1", "php": ">=7.1" }, "conflict": { @@ -2477,6 +2480,7 @@ }, "require-dev": { "nette/tester": "^2.2", + "phpstan/phpstan": "^0.12", "tracy/tracy": "^2.3" }, "type": "library", @@ -2488,16 +2492,13 @@ "autoload": { "classmap": [ "src/" - ], - "files": [ - "src/compatibility.php" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause", - "GPL-2.0", - "GPL-3.0" + "GPL-2.0-only", + "GPL-3.0-only" ], "authors": [ { @@ -2520,24 +2521,24 @@ "nette", "static" ], - "time": "2019-08-07T12:11:33+00:00" + "time": "2020-01-20T12:14:54+00:00" }, { "name": "nette/finder", - "version": "v2.5.1", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/nette/finder.git", - "reference": "14164e1ddd69e9c5f627ff82a10874b3f5bba5fe" + "reference": "4ad2c298eb8c687dd0e74ae84206a4186eeaed50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/finder/zipball/14164e1ddd69e9c5f627ff82a10874b3f5bba5fe", - "reference": "14164e1ddd69e9c5f627ff82a10874b3f5bba5fe", + "url": "https://api.github.com/repos/nette/finder/zipball/4ad2c298eb8c687dd0e74ae84206a4186eeaed50", + "reference": "4ad2c298eb8c687dd0e74ae84206a4186eeaed50", "shasum": "" }, "require": { - "nette/utils": "^2.4 || ~3.0.0", + "nette/utils": "^2.4 || ^3.0", "php": ">=7.1" }, "conflict": { @@ -2545,6 +2546,7 @@ }, "require-dev": { "nette/tester": "^2.0", + "phpstan/phpstan": "^0.12", "tracy/tracy": "^2.3" }, "type": "library", @@ -2582,35 +2584,36 @@ "iterator", "nette" ], - "time": "2019-07-11T18:02:17+00:00" + "time": "2020-01-03T20:35:40+00:00" }, { "name": "nette/neon", - "version": "v3.0.0", + "version": "v3.1.1", "source": { "type": "git", "url": "https://github.com/nette/neon.git", - "reference": "cbff32059cbdd8720deccf9e9eace6ee516f02eb" + "reference": "bf658bafcf56e36cfa0922f4866869927672cf2c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/neon/zipball/cbff32059cbdd8720deccf9e9eace6ee516f02eb", - "reference": "cbff32059cbdd8720deccf9e9eace6ee516f02eb", + "url": "https://api.github.com/repos/nette/neon/zipball/bf658bafcf56e36cfa0922f4866869927672cf2c", + "reference": "bf658bafcf56e36cfa0922f4866869927672cf2c", "shasum": "" }, "require": { "ext-iconv": "*", "ext-json": "*", - "php": ">=7.0" + "php": ">=7.1" }, "require-dev": { "nette/tester": "^2.0", + "phpstan/phpstan": "^0.12", "tracy/tracy": "^2.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -2621,8 +2624,8 @@ "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause", - "GPL-2.0", - "GPL-3.0" + "GPL-2.0-only", + "GPL-3.0-only" ], "authors": [ { @@ -2634,8 +2637,8 @@ "homepage": "https://nette.org/contributors" } ], - "description": "? Nette NEON: encodes and decodes NEON file format.", - "homepage": "http://ne-on.org", + "description": "🍸 Nette NEON: encodes and decodes NEON file format.", + "homepage": "https://ne-on.org", "keywords": [ "export", "import", @@ -2643,28 +2646,29 @@ "nette", "yaml" ], - "time": "2019-02-05T21:30:40+00:00" + "time": "2020-02-12T11:15:48+00:00" }, { "name": "nette/php-generator", - "version": "v3.3.1", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/nette/php-generator.git", - "reference": "4240fd7adf499138c07b814ef9b9a6df9f6d7187" + "reference": "8fe7e699dca7db186f56d75800cb1ec32e39c856" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/php-generator/zipball/4240fd7adf499138c07b814ef9b9a6df9f6d7187", - "reference": "4240fd7adf499138c07b814ef9b9a6df9f6d7187", + "url": "https://api.github.com/repos/nette/php-generator/zipball/8fe7e699dca7db186f56d75800cb1ec32e39c856", + "reference": "8fe7e699dca7db186f56d75800cb1ec32e39c856", "shasum": "" }, "require": { - "nette/utils": "^2.4.2 || ~3.0.0", + "nette/utils": "^2.4.2 || ^3.0", "php": ">=7.1" }, "require-dev": { "nette/tester": "^2.0", + "phpstan/phpstan": "^0.12", "tracy/tracy": "^2.3" }, "type": "library", @@ -2681,8 +2685,8 @@ "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause", - "GPL-2.0", - "GPL-3.0" + "GPL-2.0-only", + "GPL-3.0-only" ], "authors": [ { @@ -2694,7 +2698,7 @@ "homepage": "https://nette.org/contributors" } ], - "description": "🐘 Nette PHP Generator: generates neat PHP code for you. Supports new PHP 7.3 features.", + "description": "🐘 Nette PHP Generator: generates neat PHP code for you. Supports new PHP 7.4 features.", "homepage": "https://nette.org", "keywords": [ "code", @@ -2702,30 +2706,31 @@ "php", "scaffolding" ], - "time": "2019-11-22T11:12:11+00:00" + "time": "2020-02-09T14:39:09+00:00" }, { "name": "nette/robot-loader", - "version": "v3.2.0", + "version": "v3.2.2", "source": { "type": "git", "url": "https://github.com/nette/robot-loader.git", - "reference": "0712a0e39ae7956d6a94c0ab6ad41aa842544b5c" + "reference": "38e8a270567a4ad9fe716b40fcda5a6580afa3c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/robot-loader/zipball/0712a0e39ae7956d6a94c0ab6ad41aa842544b5c", - "reference": "0712a0e39ae7956d6a94c0ab6ad41aa842544b5c", + "url": "https://api.github.com/repos/nette/robot-loader/zipball/38e8a270567a4ad9fe716b40fcda5a6580afa3c0", + "reference": "38e8a270567a4ad9fe716b40fcda5a6580afa3c0", "shasum": "" }, "require": { "ext-tokenizer": "*", - "nette/finder": "^2.5", + "nette/finder": "^2.5 || ^3.0", "nette/utils": "^3.0", "php": ">=7.1" }, "require-dev": { "nette/tester": "^2.0", + "phpstan/phpstan": "^0.12", "tracy/tracy": "^2.3" }, "type": "library", @@ -2742,8 +2747,8 @@ "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause", - "GPL-2.0", - "GPL-3.0" + "GPL-2.0-only", + "GPL-3.0-only" ], "authors": [ { @@ -2755,7 +2760,7 @@ "homepage": "https://nette.org/contributors" } ], - "description": "? Nette RobotLoader: high performance and comfortable autoloader that will search and autoload classes within your application.", + "description": "🍀 Nette RobotLoader: high performance and comfortable autoloader that will search and autoload classes within your application.", "homepage": "https://nette.org", "keywords": [ "autoload", @@ -2764,35 +2769,34 @@ "nette", "trait" ], - "time": "2019-03-08T21:57:24+00:00" + "time": "2020-02-20T22:17:50+00:00" }, { "name": "nette/schema", - "version": "v1.0.1", + "version": "v1.0.2", "source": { "type": "git", "url": "https://github.com/nette/schema.git", - "reference": "337117df1dade22e2ba1fdc4a4b832c1e9b06b76" + "reference": "febf71fb4052c824046f5a33f4f769a6e7fa0cb4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/schema/zipball/337117df1dade22e2ba1fdc4a4b832c1e9b06b76", - "reference": "337117df1dade22e2ba1fdc4a4b832c1e9b06b76", + "url": "https://api.github.com/repos/nette/schema/zipball/febf71fb4052c824046f5a33f4f769a6e7fa0cb4", + "reference": "febf71fb4052c824046f5a33f4f769a6e7fa0cb4", "shasum": "" }, "require": { - "nette/utils": "^3.0.1", + "nette/utils": "^3.1", "php": ">=7.1" }, "require-dev": { "nette/tester": "^2.2", + "phpstan/phpstan-nette": "^0.12", "tracy/tracy": "^2.3" }, "type": "library", "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } + "branch-alias": [] }, "autoload": { "classmap": [ @@ -2821,20 +2825,20 @@ "config", "nette" ], - "time": "2019-10-31T20:52:19+00:00" + "time": "2020-01-06T22:52:48+00:00" }, { "name": "nette/utils", - "version": "v3.0.2", + "version": "v3.1.1", "source": { "type": "git", "url": "https://github.com/nette/utils.git", - "reference": "c133e18c922dcf3ad07673077d92d92cef25a148" + "reference": "2c17d16d8887579ae1c0898ff94a3668997fd3eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/c133e18c922dcf3ad07673077d92d92cef25a148", - "reference": "c133e18c922dcf3ad07673077d92d92cef25a148", + "url": "https://api.github.com/repos/nette/utils/zipball/2c17d16d8887579ae1c0898ff94a3668997fd3eb", + "reference": "2c17d16d8887579ae1c0898ff94a3668997fd3eb", "shasum": "" }, "require": { @@ -2842,6 +2846,7 @@ }, "require-dev": { "nette/tester": "~2.0", + "phpstan/phpstan": "^0.12", "tracy/tracy": "^2.3" }, "suggest": { @@ -2856,7 +2861,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -2867,8 +2872,8 @@ "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause", - "GPL-2.0", - "GPL-3.0" + "GPL-2.0-only", + "GPL-3.0-only" ], "authors": [ { @@ -2898,7 +2903,7 @@ "utility", "validation" ], - "time": "2019-10-21T20:40:16+00:00" + "time": "2020-02-09T14:10:55+00:00" }, { "name": "ocramius/package-versions", @@ -3074,16 +3079,16 @@ }, { "name": "symfony/console", - "version": "v4.4.1", + "version": "v4.4.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "f0aea3df20d15635b3cb9730ca5eea1c65b7f201" + "reference": "f512001679f37e6a042b51897ed24a2f05eba656" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/f0aea3df20d15635b3cb9730ca5eea1c65b7f201", - "reference": "f0aea3df20d15635b3cb9730ca5eea1c65b7f201", + "url": "https://api.github.com/repos/symfony/console/zipball/f512001679f37e6a042b51897ed24a2f05eba656", + "reference": "f512001679f37e6a042b51897ed24a2f05eba656", "shasum": "" }, "require": { @@ -3146,20 +3151,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-12-01T10:06:17+00:00" + "time": "2020-01-25T12:44:29+00:00" }, { "name": "symfony/finder", - "version": "v4.4.1", + "version": "v4.4.4", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "ce8743441da64c41e2a667b8eb66070444ed911e" + "reference": "3a50be43515590faf812fbd7708200aabc327ec3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/ce8743441da64c41e2a667b8eb66070444ed911e", - "reference": "ce8743441da64c41e2a667b8eb66070444ed911e", + "url": "https://api.github.com/repos/symfony/finder/zipball/3a50be43515590faf812fbd7708200aabc327ec3", + "reference": "3a50be43515590faf812fbd7708200aabc327ec3", "shasum": "" }, "require": { @@ -3195,20 +3200,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2019-11-17T21:56:56+00:00" + "time": "2020-01-04T13:00:46+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.13.1", + "version": "v1.14.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "4b0e2222c55a25b4541305a053013d5647d3a25f" + "reference": "5e66a0fa1070bf46bec4bea7962d285108edd675" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/4b0e2222c55a25b4541305a053013d5647d3a25f", - "reference": "4b0e2222c55a25b4541305a053013d5647d3a25f", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/5e66a0fa1070bf46bec4bea7962d285108edd675", + "reference": "5e66a0fa1070bf46bec4bea7962d285108edd675", "shasum": "" }, "require": { @@ -3217,7 +3222,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.14-dev" } }, "autoload": { @@ -3253,7 +3258,7 @@ "portable", "shim" ], - "time": "2019-11-27T16:25:15+00:00" + "time": "2020-01-13T11:15:53+00:00" }, { "name": "symfony/service-contracts", diff --git a/package-lock.json b/package-lock.json index c0376fb..c56b052 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3,9 +3,9 @@ "lockfileVersion": 1, "dependencies": { "@fortawesome/fontawesome-free": { - "version": "5.11.2", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.11.2.tgz", - "integrity": "sha512-XiUPoS79r1G7PcpnNtq85TJ7inJWe0v+b5oZJZKb0pGHNIV6+UiNeQWiFGmuQ0aj7GEhnD/v9iqxIsjuRKtEnQ==" + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.12.1.tgz", + "integrity": "sha512-ZtjIIFplxncqxvogq148C3hBLQE+W3iJ8E4UvJ09zIJUgzwLcROsWwFDErVSXY2Plzao5J9KUYNHKHMEUYDMKw==" }, "abbrev": { "version": "1.1.1", @@ -107,6 +107,11 @@ "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.4.1.tgz", "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA==" }, + "bootstrap4-toggle": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/bootstrap4-toggle/-/bootstrap4-toggle-3.6.1.tgz", + "integrity": "sha512-eRejcTc9YurhZ64nHY9Ii9DQn+F9/R74H9RPoeANVM3N1+C2lZ2tUuFCx1w3orOJ1y/iG4A7iCwdDZphMDIrYg==" + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -250,9 +255,9 @@ "dev": true }, "core-js": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.4.1.tgz", - "integrity": "sha512-KX/dnuY/J8FtEwbnrzmAjUYgLqtk+cxM86hfG60LGiW3MmltIc2yAmDgBgEkfm0blZhUrdr1Zd84J2Y14mLxzg==" + "version": "3.6.4", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz", + "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==" }, "core-util-is": { "version": "1.0.2", @@ -360,9 +365,9 @@ } }, "dropzone": { - "version": "5.5.1", - "resolved": "https://registry.npmjs.org/dropzone/-/dropzone-5.5.1.tgz", - "integrity": "sha512-3VduRWLxx9hbVr42QieQN25mx/I61/mRdUSuxAmDGdDqZIN8qtP7tcKMa3KfpJjuGjOJGYYUzzeq6eGDnkzesA==" + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/dropzone/-/dropzone-5.7.0.tgz", + "integrity": "sha512-kOltiZXH5cO/72I22JjE+w6BoT6uaVLfWdFMsi1PMKFkU6BZWpqRwjnsRm0o6ANGTBuZar5Piu7m/CbKqRPiYg==" }, "duplexer": { "version": "0.1.1", @@ -1025,9 +1030,9 @@ } }, "loadjs": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/loadjs/-/loadjs-3.6.1.tgz", - "integrity": "sha512-AZEBw2GWdJk2IzBgQ+Wohoao5j+t0rajqK8dJu8jQqgYxDTxhmCt0ayMo/vCa0ZAMvZxnJcam6uLICfnVd8KAw==" + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/loadjs/-/loadjs-4.2.0.tgz", + "integrity": "sha512-AgQGZisAlTPbTEzrHPb6q+NYBMD+DP9uvGSIjSUM5uG+0jG15cb8axWpxuOIqrmQjn6scaaH8JwloiP27b2KXA==" }, "locate-path": { "version": "2.0.0", @@ -1340,21 +1345,21 @@ } }, "plyr": { - "version": "3.5.6", - "resolved": "https://registry.npmjs.org/plyr/-/plyr-3.5.6.tgz", - "integrity": "sha512-buudbt2qwZYjEdBXW9DvQ7t/LqaSbv9tSjCrqg7nTXVM5BXNdhuiJCyvko+5+DFMdp30mliyKGoOHGXz43OwrA==", + "version": "3.5.10", + "resolved": "https://registry.npmjs.org/plyr/-/plyr-3.5.10.tgz", + "integrity": "sha512-wbbSuzk3yKVOmYWQUnxG1bxikqZNkxZmL3OjS1DFVU0D2Uko1evGY72LuD9rm/HnNCNzcTuc0c6MCn7bRRpUTA==", "requires": { - "core-js": "^3.1.4", + "core-js": "^3.6.4", "custom-event-polyfill": "^1.0.7", - "loadjs": "^3.6.1", + "loadjs": "^4.2.0", "rangetouch": "^2.0.0", - "url-polyfill": "^1.1.5" + "url-polyfill": "^1.1.8" } }, "popper.js": { - "version": "1.16.0", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.0.tgz", - "integrity": "sha512-+G+EkOPoE5S/zChTpmBSSDYmhXJ5PsW8eMhH8cP/CQHMFPBG/kC9Y5IIw6qNYgdJ+/COf0ddY2li28iHaZRSjw==" + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", + "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==" }, "pretty-bytes": { "version": "3.0.1", @@ -1651,9 +1656,9 @@ "dev": true }, "url-polyfill": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/url-polyfill/-/url-polyfill-1.1.7.tgz", - "integrity": "sha512-ZrAxYWCREjmMtL8gSbSiKKLZZticgihCvVBtrFbUVpyoETt8GQJeG2okMWA8XryDAaHMjJfhnc+rnhXRbI4DXA==" + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/url-polyfill/-/url-polyfill-1.1.8.tgz", + "integrity": "sha512-Ey61F4FEqhcu1vHSOMmjl0Vd/RPRLEjMj402qszD/dhMBrVfoUsnIj8KSZo2yj+eIlxJGKFdnm6ES+7UzMgZ3Q==" }, "util-deprecate": { "version": "1.0.2", diff --git a/package.json b/package.json index e3dfaba..1f637e9 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,14 @@ { "dependencies": { - "@fortawesome/fontawesome-free": "^5.11.2", + "@fortawesome/fontawesome-free": "^5.12.1", "bootstrap": "^4.4.1", + "bootstrap4-toggle": "^3.6.1", "clipboard": "^2.0.4", - "dropzone": "^5.5.1", + "dropzone": "^5.7.0", "highlightjs": "^9.16.2", "jquery": "^3.4.1", - "plyr": "^3.5.6", - "popper.js": "^1.16.0", + "plyr": "^3.5.10", + "popper.js": "^1.16.1", "tooltip.js": "^1.3.3" }, "devDependencies": { diff --git a/resources/lang/en.lang.php b/resources/lang/en.lang.php index d00164a..415acc0 100644 --- a/resources/lang/en.lang.php +++ b/resources/lang/en.lang.php @@ -40,7 +40,8 @@ return [ 'apply' => 'Apply', 'save' => 'Save', 'used' => 'Used', - 'system_info' => 'System Information', + 'php_info' => 'PHP Informations', + 'system_settings' => 'System Settings', 'user.create' => 'Create User', 'user.edit' => 'Edit User', 'is_active' => 'Is active', diff --git a/resources/templates/base.twig b/resources/templates/base.twig index bb01c9f..f64d01e 100644 --- a/resources/templates/base.twig +++ b/resources/templates/base.twig @@ -25,6 +25,7 @@ + + diff --git a/resources/templates/dashboard/system.twig b/resources/templates/dashboard/system.twig index d70acb7..9568b8f 100644 --- a/resources/templates/dashboard/system.twig +++ b/resources/templates/dashboard/system.twig @@ -54,7 +54,76 @@
-
+ +
+
{{ lang('system_settings') }}
+
+
+ + + +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ + +
+ +
+ +
+
+ +
+ +
+ + {{ lang('default_lang_behavior') }} +
+
+ +
+ +
+ + {{ lang('custom_head_html_hint') }} +
+
+ + +
+
+
+ + + + {#
{{ lang('theme') }}
@@ -105,7 +174,7 @@
-
+
#}
{{ lang('updates') }} v{{ PLATFORM_VERSION }}
@@ -131,23 +200,24 @@
-
-
{{ lang('custom_head_html') }}
-
-
- - {{ lang('custom_head_html_hint') }} - -
-
-
+{#
#} +{#
{{ lang('custom_head_html') }}
#} +{#
#} +{#
#} +{# #} +{# {{ lang('custom_head_html_hint') }}#} +{# #} +{#
#} +{#
#} +{#
#}
-
{{ lang('system_info') }}
+
{{ lang('php_info') }}
+ PHP Version: {{ php_version }}
Max upload size:
  • post_max_size: {{ post_max_size }}