mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-04-26 22:48:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into master

Browse source
This commit is contained in:
Jérémy Benoist 2023-01-02 10:24:44 +01:00 committed by GitHub
parent 9426be3dbb c3305baef3
commit 719f9004d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 78 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
composer.lock generated
View file

@ -2019,20 +2019,20 @@
},
{
"name": "egulias/email-validator",
"version": "3.2.1",
"version": "3.2.4",
"source": {
"type": "git",
"url": "https://github.com/egulias/EmailValidator.git",
"reference": "f88dcf4b14af14a98ad96b14b2b317969eab6715"
"reference": "5f35e41eba05fdfbabd95d72f83795c835fb7ed2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/egulias/EmailValidator/zipball/f88dcf4b14af14a98ad96b14b2b317969eab6715",
"reference": "f88dcf4b14af14a98ad96b14b2b317969eab6715",
"url": "https://api.github.com/repos/egulias/EmailValidator/zipball/5f35e41eba05fdfbabd95d72f83795c835fb7ed2",
"reference": "5f35e41eba05fdfbabd95d72f83795c835fb7ed2",
"shasum": ""
},
"require": {
"doctrine/lexer": "^1.2",
"doctrine/lexer": "^1.2|^2",
"php": ">=7.2",
"symfony/polyfill-intl-idn": "^1.15"
},
@ -2075,7 +2075,7 @@
],
"support": {
"issues": "https://github.com/egulias/EmailValidator/issues",
"source": "https://github.com/egulias/EmailValidator/tree/3.2.1"
"source": "https://github.com/egulias/EmailValidator/tree/3.2.4"
},
"funding": [
{
@ -2083,7 +2083,7 @@
"type": "github"
}
],
"time": "2022-06-18T20:57:19+00:00"
"time": "2022-12-30T14:09:25+00:00"
},
{
"name": "endroid/qr-code",
@ -7695,16 +7695,16 @@
},
{
"name": "phpstan/phpdoc-parser",
"version": "1.15.2",
"version": "1.15.3",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpdoc-parser.git",
"reference": "5941477f100993652218928039d530b75a13a9ca"
"reference": "61800f71a5526081d1b5633766aa88341f1ade76"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/5941477f100993652218928039d530b75a13a9ca",
"reference": "5941477f100993652218928039d530b75a13a9ca",
"url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/61800f71a5526081d1b5633766aa88341f1ade76",
"reference": "61800f71a5526081d1b5633766aa88341f1ade76",
"shasum": ""
},
"require": {
@ -7734,9 +7734,9 @@
"description": "PHPDoc parser with support for nullable, intersection and generic types",
"support": {
"issues": "https://github.com/phpstan/phpdoc-parser/issues",
"source": "https://github.com/phpstan/phpdoc-parser/tree/1.15.2"
"source": "https://github.com/phpstan/phpdoc-parser/tree/1.15.3"
},
"time": "2022-12-16T06:42:48+00:00"
"time": "2022-12-20T20:56:55+00:00"
},
{
"name": "phpzip/phpzip",
@ -11161,16 +11161,16 @@
},
{
"name": "twig/extra-bundle",
"version": "v3.4.0",
"version": "v3.5.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/twig-extra-bundle.git",
"reference": "2e58256b0e9fe52f30149347c0547e4633304765"
"reference": "edfcdbdc943b52101011d57ec546af393dc56537"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/twig-extra-bundle/zipball/2e58256b0e9fe52f30149347c0547e4633304765",
"reference": "2e58256b0e9fe52f30149347c0547e4633304765",
"url": "https://api.github.com/repos/twigphp/twig-extra-bundle/zipball/edfcdbdc943b52101011d57ec546af393dc56537",
"reference": "edfcdbdc943b52101011d57ec546af393dc56537",
"shasum": ""
},
"require": {
@ -11193,7 +11193,7 @@
"type": "symfony-bundle",
"extra": {
"branch-alias": {
"dev-master": "3.2-dev"
"dev-master": "3.5-dev"
}
},
"autoload": {
@ -11224,7 +11224,7 @@
"twig"
],
"support": {
"source": "https://github.com/twigphp/twig-extra-bundle/tree/v3.4.0"
"source": "https://github.com/twigphp/twig-extra-bundle/tree/v3.5.0"
},
"funding": [
{
@ -11236,20 +11236,20 @@
"type": "tidelift"
}
],
"time": "2022-01-04T13:58:53+00:00"
"time": "2022-12-27T12:23:36+00:00"
},
{
"name": "twig/string-extra",
"version": "v3.4.0",
"version": "v3.5.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/string-extra.git",
"reference": "03608ae2e9c270a961e8cf1b75751e8635ad3e3c"
"reference": "73c458625c685b3cb3986ec2f5f83ebd1247bcb3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/string-extra/zipball/03608ae2e9c270a961e8cf1b75751e8635ad3e3c",
"reference": "03608ae2e9c270a961e8cf1b75751e8635ad3e3c",
"url": "https://api.github.com/repos/twigphp/string-extra/zipball/73c458625c685b3cb3986ec2f5f83ebd1247bcb3",
"reference": "73c458625c685b3cb3986ec2f5f83ebd1247bcb3",
"shasum": ""
},
"require": {
@ -11264,7 +11264,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.2-dev"
"dev-master": "3.5-dev"
}
},
"autoload": {
@ -11296,7 +11296,7 @@
"unicode"
],
"support": {
"source": "https://github.com/twigphp/string-extra/tree/v3.4.0"
"source": "https://github.com/twigphp/string-extra/tree/v3.5.0"
},
"funding": [
{
@ -11308,20 +11308,20 @@
"type": "tidelift"
}
],
"time": "2022-01-02T10:02:25+00:00"
"time": "2022-12-27T12:23:36+00:00"
},
{
"name": "twig/twig",
"version": "v3.4.3",
"version": "v3.5.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "c38fd6b0b7f370c198db91ffd02e23b517426b58"
"reference": "3ffcf4b7d890770466da3b2666f82ac054e7ec72"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/c38fd6b0b7f370c198db91ffd02e23b517426b58",
"reference": "c38fd6b0b7f370c198db91ffd02e23b517426b58",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/3ffcf4b7d890770466da3b2666f82ac054e7ec72",
"reference": "3ffcf4b7d890770466da3b2666f82ac054e7ec72",
"shasum": ""
},
"require": {
@ -11336,7 +11336,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.4-dev"
"dev-master": "3.5-dev"
}
},
"autoload": {
@ -11372,7 +11372,7 @@
],
"support": {
"issues": "https://github.com/twigphp/Twig/issues",
"source": "https://github.com/twigphp/Twig/tree/v3.4.3"
"source": "https://github.com/twigphp/Twig/tree/v3.5.0"
},
"funding": [
{
@ -11384,7 +11384,7 @@
"type": "tidelift"
}
],
"time": "2022-09-28T08:42:51+00:00"
"time": "2022-12-27T12:28:18+00:00"
},
{
"name": "wallabag/php-mobi",
@ -12452,16 +12452,16 @@
},
{
"name": "m6web/redis-mock",
"version": "v5.3.0",
"version": "v5.4.0",
"source": {
"type": "git",
"url": "https://github.com/BedrockStreaming/RedisMock.git",
"reference": "e126231c0130ff2e83d53dbc0c305a8eed20372e"
"reference": "04bf5e9eee78806b01a2dc0f00d1d01feded9241"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/BedrockStreaming/RedisMock/zipball/e126231c0130ff2e83d53dbc0c305a8eed20372e",
"reference": "e126231c0130ff2e83d53dbc0c305a8eed20372e",
"url": "https://api.github.com/repos/BedrockStreaming/RedisMock/zipball/04bf5e9eee78806b01a2dc0f00d1d01feded9241",
"reference": "04bf5e9eee78806b01a2dc0f00d1d01feded9241",
"shasum": ""
},
"require": {
@ -12495,9 +12495,9 @@
],
"support": {
"issues": "https://github.com/BedrockStreaming/RedisMock/issues",
"source": "https://github.com/BedrockStreaming/RedisMock/tree/v5.3.0"
"source": "https://github.com/BedrockStreaming/RedisMock/tree/v5.4.0"
},
"time": "2022-06-14T17:39:03+00:00"
"time": "2022-12-29T10:57:22+00:00"
},
{
"name": "nikic/php-parser",
@ -12781,16 +12781,16 @@
},
{
"name": "phpstan/phpstan-doctrine",
"version": "1.3.27",
"version": "1.3.28",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan-doctrine.git",
"reference": "cf2bc2391bf179c901526f23c8bb33d16dc0fdb2"
"reference": "8302a6a214b8cbbda8249cce6ec627033af26c12"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/cf2bc2391bf179c901526f23c8bb33d16dc0fdb2",
"reference": "cf2bc2391bf179c901526f23c8bb33d16dc0fdb2",
"url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/8302a6a214b8cbbda8249cce6ec627033af26c12",
"reference": "8302a6a214b8cbbda8249cce6ec627033af26c12",
"shasum": ""
},
"require": {
@ -12844,9 +12844,9 @@
"description": "Doctrine extensions for PHPStan",
"support": {
"issues": "https://github.com/phpstan/phpstan-doctrine/issues",
"source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.27"
"source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.28"
},
"time": "2022-12-16T09:07:46+00:00"
"time": "2022-12-30T21:24:11+00:00"
},
{
"name": "phpstan/phpstan-phpunit",
@ -13061,16 +13061,16 @@
},
{
"name": "symfony/phpunit-bridge",
"version": "v6.2.0",
"version": "v6.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/phpunit-bridge.git",
"reference": "1bd3b17db6d2ec284efbdc916600e880d6d858df"
"reference": "3766b8269d3bac5c214a04ebd6870e71e52bcb60"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/1bd3b17db6d2ec284efbdc916600e880d6d858df",
"reference": "1bd3b17db6d2ec284efbdc916600e880d6d858df",
"url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/3766b8269d3bac5c214a04ebd6870e71e52bcb60",
"reference": "3766b8269d3bac5c214a04ebd6870e71e52bcb60",
"shasum": ""
},
"require": {
@ -13124,7 +13124,7 @@
"description": "Provides utilities for PHPUnit, especially user deprecation notices management",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/phpunit-bridge/tree/v6.2.0"
"source": "https://github.com/symfony/phpunit-bridge/tree/v6.2.3"
},
"funding": [
{
@ -13140,7 +13140,7 @@
"type": "tidelift"
}
],
"time": "2022-11-18T19:08:09+00:00"
"time": "2022-12-28T14:26:22+00:00"
}
],
"aliases": [],

2
docker/php/Dockerfile
View file

@ -53,7 +53,7 @@ RUN docker-php-ext-install -j "$(nproc)" \
RUN pecl install redis; \
pecl install imagick; \
pecl install xdebug; \
pecl install xdebug-3.1.6; \
docker-php-ext-enable \
redis \
imagick \

12
docker/php/config/parameters.yml
View file

@ -6,7 +6,7 @@ parameters:
database_name: ${DATABASE_NAME:-symfony}
database_user: ${DATABASE_USER:-root}
database_password: ${DATABASE_PASSWORD:-~}
database_path: ${DATABASE_PATH:-"%kernel.root_dir%/data/db/wallabag.sqlite"}
database_path: '${DATABASE_PATH:-"%kernel.root_dir%/data/db/wallabag.sqlite"}'
database_table_prefix: ${DATABASE_TABLE_PREFIX:-wallabag_}
database_socket: null
database_charset: ${DATABASE_CHARSET:-utf8}
@ -14,15 +14,9 @@ parameters:
domain_name: ${DOMAIN_NAME:-https://www.example.com}
server_name: ${SERVER_NAME:-"Your wallabag instance"}
mailer_transport: ${MAILER_TRANSPORT:-smtp}
mailer_user: ${MAILER_USER:-~}
mailer_password: ${MAILER_PASSWORD:-~}
mailer_host: ${MAILER_HOST:-127.0.0.1}
mailer_port: ${MAILER_PORT:-25}
mailer_encryption: ${MAILER_ENCRYPTION:-~}
mailer_auth_mode: ${MAILER_AUTH_MODE:-~}
mailer_dsn: ${MAILER_DSN:-"smtp://127.0.0.1"}
locale: ${LOCALE:-en}
locale: ${LOCALE:-en}
# A secret key that's used to generate certain security-related tokens
secret: ${SECRET:-~}

6
package.json
View file

@ -42,7 +42,7 @@
"autoprefixer": "^10.4.13",
"babel-loader": "^9.1.0",
"css-loader": "^6.7.3",
"eslint": "^8.30.0",
"eslint": "^8.31.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-plugin-import": "^2.26.0",
"eslint-webpack-plugin": "^3.2.0",
@ -56,7 +56,7 @@
"sass": "^1.57.1",
"sass-loader": "^13.2.0",
"style-loader": "^3.3.1",
"stylelint": "^14.16.0",
"stylelint": "^14.16.1",
"stylelint-config-standard": "^29.0.0",
"stylelint-scss": "^4.3.0",
"stylelint-webpack-plugin": "^3.3.0",
@ -74,7 +74,7 @@
"hammerjs": "^2.0.8",
"highlight.js": "^11.7.0",
"icomoon-free-npm": "^0.0.0",
"jquery": "^3.6.2",
"jquery": "^3.6.3",
"jquery.cookie": "^1.4.1",
"jr-qrcode": "^1.0.7",
"material-design-icons-iconfont": "^6.7.0",

2
web/wallassets/material.js
View file

File diff suppressed because one or more lines are too long

2
web/wallassets/material.js.map
View file

File diff suppressed because one or more lines are too long

34
yarn.lock
View file

@ -997,10 +997,10 @@
resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
"@eslint/eslintrc@^1.4.0":
version "1.4.0"
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.0.tgz#8ec64e0df3e7a1971ee1ff5158da87389f167a63"
integrity sha512-7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A==
"@eslint/eslintrc@^1.4.1":
version "1.4.1"
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz#af58772019a2d271b7e2d4c23ff4ddcba3ccfb3e"
integrity sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==
dependencies:
ajv "^6.12.4"
debug "^4.3.2"
@ -2526,12 +2526,12 @@ eslint-webpack-plugin@^3.2.0:
normalize-path "^3.0.0"
schema-utils "^4.0.0"
eslint@^8.30.0:
version "8.30.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.30.0.tgz#83a506125d089eef7c5b5910eeea824273a33f50"
integrity sha512-MGADB39QqYuzEGov+F/qb18r4i7DohCDOfatHaxI2iGlPuC65bwG2gxgO+7DkyL38dRFaRH7RaRAgU6JKL9rMQ==
eslint@^8.31.0:
version "8.31.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.31.0.tgz#75028e77cbcff102a9feae1d718135931532d524"
integrity sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==
dependencies:
"@eslint/eslintrc" "^1.4.0"
"@eslint/eslintrc" "^1.4.1"
"@humanwhocodes/config-array" "^0.11.8"
"@humanwhocodes/module-importer" "^1.0.1"
"@nodelib/fs.walk" "^1.2.8"
@ -3588,10 +3588,10 @@ jquery@^2.1.4:
resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.4.tgz#2c89d6889b5eac522a7eea32c14521559c6cbf02"
integrity sha512-lBHj60ezci2u1v2FqnZIraShGgEXq35qCzMv4lITyHGppTnA13rwR0MgwyNJh9TnDs3aXUvd1xjAotfraMHX/Q==
jquery@^3.6.2:
version "3.6.2"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.2.tgz#8302bbc9160646f507bdf59d136a478b312783c4"
integrity sha512-/e7ulNIEEYk1Z/l4X0vpxGt+B/dNsV8ghOPAWZaJs8pkGvsSC0tm33aMGylXcj/U7y4IcvwtMXPMyBFZn/gK9A==
jquery@^3.6.3:
version "3.6.3"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.3.tgz#23ed2ffed8a19e048814f13391a19afcdba160e6"
integrity sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg==
jquery@~1.11.0:
version "1.11.3"
@ -5310,10 +5310,10 @@ stylelint-webpack-plugin@^3.3.0:
normalize-path "^3.0.0"
schema-utils "^4.0.0"
stylelint@^14.16.0:
version "14.16.0"
resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.16.0.tgz#8e1a424f4b9852e59089f95de306734d70e5048b"
integrity sha512-X6uTi9DcxjzLV8ZUAjit1vsRtSwcls0nl07c9rqOPzvpA8IvTX/xWEkBRowS0ffevRrqkHa/ThDEu86u73FQDg==
stylelint@^14.16.1:
version "14.16.1"
resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.16.1.tgz#b911063530619a1bbe44c2b875fd8181ebdc742d"
integrity sha512-ErlzR/T3hhbV+a925/gbfc3f3Fep9/bnspMiJPorfGEmcBbXdS+oo6LrVtoUZ/w9fqD6o6k7PtUlCOsCRdjX/A==
dependencies:
"@csstools/selector-specificity" "^2.0.2"
balanced-match "^2.0.0"