diff --git a/.github/dependabot.yml b/.github/dependabot.yml index db065cfffc..557d6df1e7 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -19,3 +19,10 @@ updates: schedule: interval: "weekly" + - package-ecosystem: "github-actions" + directory: "/" + target-branch: develop + labels: ["bug"] + versioning-strategy: increase + schedule: + interval: "weekly" diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index d496885df3..0f5a22b381 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -45,7 +45,6 @@ class AppServiceProvider extends ServiceProvider if ('heroku' === config('app.env')) { URL::forceScheme('https'); } - Sanctum::ignoreMigrations(); } /** @@ -56,5 +55,6 @@ class AppServiceProvider extends ServiceProvider public function register(): void { Passport::ignoreMigrations(); + Sanctum::ignoreMigrations(); } } diff --git a/composer.json b/composer.json index 09a6bfdfc0..aef90f17f6 100644 --- a/composer.json +++ b/composer.json @@ -103,7 +103,7 @@ "ramsey/uuid": "^4.3", "rcrowe/twigbridge": "^0.14", "spatie/data-transfer-object": "^3.7", - "spatie/laravel-ignition": "^1.0", + "spatie/laravel-ignition": "^1.2", "symfony/http-client": "^6.0", "symfony/mailgun-mailer": "^6.0" }, diff --git a/composer.lock b/composer.lock index 7c4b6e8a8b..e3d027031d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "28dfb21ecd8812aeb96941a3038c643f", + "content-hash": "3e2b5b26154ac5fa507410856ceef4b9", "packages": [ { "name": "bacon/bacon-qr-code", @@ -1148,16 +1148,16 @@ }, { "name": "firebase/php-jwt", - "version": "v6.1.0", + "version": "v6.1.2", "source": { "type": "git", "url": "https://github.com/firebase/php-jwt.git", - "reference": "fbb2967a3a68b07e37678c00c0cf51165051495f" + "reference": "c297139da7c6873dbd67cbd1093f09ec0bbd0c50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/fbb2967a3a68b07e37678c00c0cf51165051495f", - "reference": "fbb2967a3a68b07e37678c00c0cf51165051495f", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/c297139da7c6873dbd67cbd1093f09ec0bbd0c50", + "reference": "c297139da7c6873dbd67cbd1093f09ec0bbd0c50", "shasum": "" }, "require": { @@ -1199,9 +1199,9 @@ ], "support": { "issues": "https://github.com/firebase/php-jwt/issues", - "source": "https://github.com/firebase/php-jwt/tree/v6.1.0" + "source": "https://github.com/firebase/php-jwt/tree/v6.1.2" }, - "time": "2022-03-23T18:26:04+00:00" + "time": "2022-04-21T14:37:18+00:00" }, { "name": "fruitcake/php-cors", @@ -1855,16 +1855,16 @@ }, { "name": "laravel/framework", - "version": "v9.8.1", + "version": "v9.9.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "9f468689964ac80b674a2fe71a56baa7e9e20493" + "reference": "4d5a07640891b772188d7737348886a0222737d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/9f468689964ac80b674a2fe71a56baa7e9e20493", - "reference": "9f468689964ac80b674a2fe71a56baa7e9e20493", + "url": "https://api.github.com/repos/laravel/framework/zipball/4d5a07640891b772188d7737348886a0222737d8", + "reference": "4d5a07640891b772188d7737348886a0222737d8", "shasum": "" }, "require": { @@ -2030,20 +2030,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2022-04-12T15:43:03+00:00" + "time": "2022-04-19T15:01:23+00:00" }, { "name": "laravel/passport", - "version": "v10.4.0", + "version": "v10.4.1", "source": { "type": "git", "url": "https://github.com/laravel/passport.git", - "reference": "5bb6637cb5bf397381be4542719ea3694c808dcd" + "reference": "b62b418a6d9e9aca231a587be0fc14dc55cd8d77" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/passport/zipball/5bb6637cb5bf397381be4542719ea3694c808dcd", - "reference": "5bb6637cb5bf397381be4542719ea3694c808dcd", + "url": "https://api.github.com/repos/laravel/passport/zipball/b62b418a6d9e9aca231a587be0fc14dc55cd8d77", + "reference": "b62b418a6d9e9aca231a587be0fc14dc55cd8d77", "shasum": "" }, "require": { @@ -2107,7 +2107,7 @@ "issues": "https://github.com/laravel/passport/issues", "source": "https://github.com/laravel/passport" }, - "time": "2022-03-30T14:42:50+00:00" + "time": "2022-04-16T13:38:08+00:00" }, { "name": "laravel/sanctum", @@ -2368,23 +2368,24 @@ }, { "name": "lcobucci/clock", - "version": "2.1.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/lcobucci/clock.git", - "reference": "903513d28e85376a33385ebc601afd2ee69e5653" + "reference": "fb533e093fd61321bfcbac08b131ce805fe183d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lcobucci/clock/zipball/903513d28e85376a33385ebc601afd2ee69e5653", - "reference": "903513d28e85376a33385ebc601afd2ee69e5653", + "url": "https://api.github.com/repos/lcobucci/clock/zipball/fb533e093fd61321bfcbac08b131ce805fe183d3", + "reference": "fb533e093fd61321bfcbac08b131ce805fe183d3", "shasum": "" }, "require": { - "php": "^8.0" + "php": "^8.0", + "stella-maris/clock": "^0.1.4" }, "require-dev": { - "infection/infection": "^0.25", + "infection/infection": "^0.26", "lcobucci/coding-standard": "^8.0", "phpstan/extension-installer": "^1.1", "phpstan/phpstan": "^0.12", @@ -2412,7 +2413,7 @@ "description": "Yet another clock abstraction", "support": { "issues": "https://github.com/lcobucci/clock/issues", - "source": "https://github.com/lcobucci/clock/tree/2.1.0" + "source": "https://github.com/lcobucci/clock/tree/2.2.0" }, "funding": [ { @@ -2424,7 +2425,7 @@ "type": "patreon" } ], - "time": "2021-10-31T21:32:07+00:00" + "time": "2022-04-19T19:34:17+00:00" }, { "name": "lcobucci/jwt", @@ -2828,16 +2829,16 @@ }, { "name": "league/flysystem", - "version": "3.0.16", + "version": "3.0.17", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "dea729954c596bdb6cdaecba6f73df9f3e2c4255" + "reference": "29eb78cac0be0c22237c5e0f6f98234d97037d79" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/dea729954c596bdb6cdaecba6f73df9f3e2c4255", - "reference": "dea729954c596bdb6cdaecba6f73df9f3e2c4255", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/29eb78cac0be0c22237c5e0f6f98234d97037d79", + "reference": "29eb78cac0be0c22237c5e0f6f98234d97037d79", "shasum": "" }, "require": { @@ -2898,7 +2899,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/3.0.16" + "source": "https://github.com/thephpleague/flysystem/tree/3.0.17" }, "funding": [ { @@ -2914,7 +2915,7 @@ "type": "tidelift" } ], - "time": "2022-04-11T13:32:22+00:00" + "time": "2022-04-14T14:57:13+00:00" }, { "name": "league/fractal", @@ -2988,16 +2989,16 @@ }, { "name": "league/mime-type-detection", - "version": "1.10.0", + "version": "1.11.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "3e4a35d756eedc67096f30240a68a3149120dae7" + "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/3e4a35d756eedc67096f30240a68a3149120dae7", - "reference": "3e4a35d756eedc67096f30240a68a3149120dae7", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ff6248ea87a9f116e78edd6002e39e5128a0d4dd", + "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd", "shasum": "" }, "require": { @@ -3028,7 +3029,7 @@ "description": "Mime-type detection for Flysystem", "support": { "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.10.0" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.11.0" }, "funding": [ { @@ -3040,7 +3041,7 @@ "type": "tidelift" } ], - "time": "2022-04-11T12:49:04+00:00" + "time": "2022-04-17T13:12:02+00:00" }, { "name": "league/oauth2-server", @@ -5368,16 +5369,16 @@ }, { "name": "spatie/laravel-ignition", - "version": "1.2.0", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/spatie/laravel-ignition.git", - "reference": "2b54c8c66f2d280f25e15064ebe3d5e3eda19820" + "reference": "924d1ae878874ad0bb49f63b69a9af759a34ee78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/2b54c8c66f2d280f25e15064ebe3d5e3eda19820", - "reference": "2b54c8c66f2d280f25e15064ebe3d5e3eda19820", + "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/924d1ae878874ad0bb49f63b69a9af759a34ee78", + "reference": "924d1ae878874ad0bb49f63b69a9af759a34ee78", "shasum": "" }, "require": { @@ -5454,7 +5455,54 @@ "type": "github" } ], - "time": "2022-04-01T21:01:58+00:00" + "time": "2022-04-14T18:04:51+00:00" + }, + { + "name": "stella-maris/clock", + "version": "0.1.4", + "source": { + "type": "git", + "url": "https://gitlab.com/stella-maris/clock.git", + "reference": "8a0a967896df4c63417385dc69328a0aec84d9cf" + }, + "dist": { + "type": "zip", + "url": "https://gitlab.com/api/v4/projects/stella-maris%2Fclock/repository/archive.zip?sha=8a0a967896df4c63417385dc69328a0aec84d9cf", + "reference": "8a0a967896df4c63417385dc69328a0aec84d9cf", + "shasum": "" + }, + "require": { + "php": "^7.0|^8.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "StellaMaris\\Clock\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Andreas Heigl", + "role": "Maintainer" + } + ], + "description": "A pre-release of the proposed PSR-20 Clock-Interface", + "homepage": "https://gitlab.com/stella-maris/clock", + "keywords": [ + "clock", + "datetime", + "point in time", + "psr20" + ], + "support": { + "issues": "https://gitlab.com/stella-maris/clock/-/issues", + "source": "https://gitlab.com/stella-maris/clock/-/tree/0.1.4" + }, + "time": "2022-04-17T14:12:26+00:00" }, { "name": "symfony/console", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 26d98da52b..0aa4d6b17a 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1927,9 +1927,9 @@ astral-regex@^2.0.0: integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== async@^2.6.2: - version "2.6.3" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" - integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg== + version "2.6.4" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" + integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== dependencies: lodash "^4.17.14" diff --git a/package.json b/package.json index 2034d312d2..3e5fdc9f9e 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@johmun/vue-tags-input": "^2", - "@vue/compiler-sfc": "^3.2.29", + "@vue/compiler-sfc": "^3.2.33", "axios": "^0.26", "bootstrap-sass": "^3", "cross-env": "^7.0", diff --git a/resources/views/accounts/reconcile/transactions.twig b/resources/views/accounts/reconcile/transactions.twig index 891e988d8c..04910a6ef7 100644 --- a/resources/views/accounts/reconcile/transactions.twig +++ b/resources/views/accounts/reconcile/transactions.twig @@ -118,7 +118,9 @@ + {% if currency.id == journal.currency_id %}value="{{ journal.amount }}"{% endif %} + {% if currency.id == journal.foreign_currency_id %}value="{{ journal.foreign_amount }}"{% endif %} + data-id="{{ journal.transaction_journal_id }}" disabled class="reconcile_checkbox"> {% endif %} {% else %} diff --git a/resources/views/errors/404.twig b/resources/views/errors/404.twig index ae4c2f0dd0..ffa44c348e 100644 --- a/resources/views/errors/404.twig +++ b/resources/views/errors/404.twig @@ -19,9 +19,6 @@ - {# Firefly III customisations #} - - {# favicons #} {% include('partials.favicons') %} diff --git a/resources/views/errors/500.twig b/resources/views/errors/500.twig index 34d7b3a6da..af41119d88 100644 --- a/resources/views/errors/500.twig +++ b/resources/views/errors/500.twig @@ -19,9 +19,6 @@ - {# Firefly III customisations #} - - {# favicons #} {% include('partials.favicons') %} diff --git a/resources/views/errors/503.twig b/resources/views/errors/503.twig index d669d11821..57d19951bb 100644 --- a/resources/views/errors/503.twig +++ b/resources/views/errors/503.twig @@ -15,9 +15,6 @@ - {# Firefly III customisations #} - - {# favicons #} {% include('partials.favicons') %} diff --git a/resources/views/errors/FireflyException.twig b/resources/views/errors/FireflyException.twig index 824bee2605..b53e04453d 100644 --- a/resources/views/errors/FireflyException.twig +++ b/resources/views/errors/FireflyException.twig @@ -19,9 +19,6 @@ - {# Firefly III customisations #} - - {# favicons #} {% include('partials.favicons') %} diff --git a/yarn.lock b/yarn.lock index 0d8fdd1909..eb0a101128 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1196,47 +1196,47 @@ dependencies: "@types/node" "*" -"@vue/compiler-core@3.2.32": - version "3.2.32" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.32.tgz#a0be08214c55ae48092b413d8b552c0573e3a883" - integrity sha512-bRQ8Rkpm/aYFElDWtKkTPHeLnX5pEkNxhPUcqu5crEJIilZH0yeFu/qUAcV4VfSE2AudNPkQSOwMZofhnuutmA== +"@vue/compiler-core@3.2.33": + version "3.2.33" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.33.tgz#e915d59cce85898f5c5cfebe4c09e539278c3d59" + integrity sha512-AAmr52ji3Zhk7IKIuigX2osWWsb2nQE5xsdFYjdnmtQ4gymmqXbjLvkSE174+fF3A3kstYrTgGkqgOEbsdLDpw== dependencies: "@babel/parser" "^7.16.4" - "@vue/shared" "3.2.32" + "@vue/shared" "3.2.33" estree-walker "^2.0.2" source-map "^0.6.1" -"@vue/compiler-dom@3.2.32": - version "3.2.32" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.32.tgz#8ddae1ee463c18c5c3353c4716ec7c84ee29e5ad" - integrity sha512-maa3PNB/NxR17h2hDQfcmS02o1f9r9QIpN1y6fe8tWPrS1E4+q8MqrvDDQNhYVPd84rc3ybtyumrgm9D5Rf/kg== +"@vue/compiler-dom@3.2.33": + version "3.2.33" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.33.tgz#6db84296f949f18e5d3e7fd5e80f943dbed7d5ec" + integrity sha512-GhiG1C8X98Xz9QUX/RlA6/kgPBWJkjq0Rq6//5XTAGSYrTMBgcLpP9+CnlUg1TFxnnCVughAG+KZl28XJqw8uQ== dependencies: - "@vue/compiler-core" "3.2.32" - "@vue/shared" "3.2.32" + "@vue/compiler-core" "3.2.33" + "@vue/shared" "3.2.33" -"@vue/compiler-sfc@^3.2.29": - version "3.2.32" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.32.tgz#63e09762812b985aa97876fb5cc3265ba8990a8a" - integrity sha512-uO6+Gh3AVdWm72lRRCjMr8nMOEqc6ezT9lWs5dPzh1E9TNaJkMYPaRtdY9flUv/fyVQotkfjY/ponjfR+trPSg== +"@vue/compiler-sfc@^3.2.33": + version "3.2.33" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.33.tgz#7ce01dc947a8b76c099811dc6ca58494d4dc773d" + integrity sha512-H8D0WqagCr295pQjUYyO8P3IejM3vEzeCO1apzByAEaAR/WimhMYczHfZVvlCE/9yBaEu/eu9RdiWr0kF8b71Q== dependencies: "@babel/parser" "^7.16.4" - "@vue/compiler-core" "3.2.32" - "@vue/compiler-dom" "3.2.32" - "@vue/compiler-ssr" "3.2.32" - "@vue/reactivity-transform" "3.2.32" - "@vue/shared" "3.2.32" + "@vue/compiler-core" "3.2.33" + "@vue/compiler-dom" "3.2.33" + "@vue/compiler-ssr" "3.2.33" + "@vue/reactivity-transform" "3.2.33" + "@vue/shared" "3.2.33" estree-walker "^2.0.2" magic-string "^0.25.7" postcss "^8.1.10" source-map "^0.6.1" -"@vue/compiler-ssr@3.2.32": - version "3.2.32" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.32.tgz#06cf7539c483ba4a25b30bd6741e440c222d4c02" - integrity sha512-ZklVUF/SgTx6yrDUkaTaBL/JMVOtSocP+z5Xz/qIqqLdW/hWL90P+ob/jOQ0Xc/om57892Q7sRSrex0wujOL2Q== +"@vue/compiler-ssr@3.2.33": + version "3.2.33" + resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.33.tgz#3e820267e4eea48fde9519f006dedca3f5e42e71" + integrity sha512-XQh1Xdk3VquDpXsnoCd7JnMoWec9CfAzQDQsaMcSU79OrrO2PNR0ErlIjm/mGq3GmBfkQjzZACV+7GhfRB8xMQ== dependencies: - "@vue/compiler-dom" "3.2.32" - "@vue/shared" "3.2.32" + "@vue/compiler-dom" "3.2.33" + "@vue/shared" "3.2.33" "@vue/component-compiler-utils@^3.1.0": version "3.3.0" @@ -1254,21 +1254,21 @@ optionalDependencies: prettier "^1.18.2 || ^2.0.0" -"@vue/reactivity-transform@3.2.32": - version "3.2.32" - resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.32.tgz#974fd2a1e682e962fbc5840be8432ac4ab8650d3" - integrity sha512-CW1W9zaJtE275tZSWIfQKiPG0iHpdtSlmTqYBu7Y62qvtMgKG5yOxtvBs4RlrZHlaqFSE26avLAgQiTp4YHozw== +"@vue/reactivity-transform@3.2.33": + version "3.2.33" + resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.33.tgz#286063f44ca56150ae9b52f8346a26e5913fa699" + integrity sha512-4UL5KOIvSQb254aqenW4q34qMXbfZcmEsV/yVidLUgvwYQQ/D21bGX3DlgPUGI3c4C+iOnNmDCkIxkILoX/Pyw== dependencies: "@babel/parser" "^7.16.4" - "@vue/compiler-core" "3.2.32" - "@vue/shared" "3.2.32" + "@vue/compiler-core" "3.2.33" + "@vue/shared" "3.2.33" estree-walker "^2.0.2" magic-string "^0.25.7" -"@vue/shared@3.2.32": - version "3.2.32" - resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.32.tgz#1ca0c3b8c03a5e24129156e171df736b2c1d645f" - integrity sha512-bjcixPErUsAnTQRQX4Z5IQnICYjIfNCyCl8p29v1M6kfVzvwOICPw+dz48nNuWlTOOx2RHhzHdazJibE8GSnsw== +"@vue/shared@3.2.33": + version "3.2.33" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.33.tgz#69a8c99ceb37c1b031d5cc4aec2ff1dc77e1161e" + integrity sha512-UBc1Pg1T3yZ97vsA2ueER0F6GbJebLHYlEi4ou1H5YL4KWvMOOWwpYo9/QpWq93wxKG6Wo13IY74Hcn/f7c7Bg== "@webassemblyjs/ast@1.11.1": version "1.11.1" @@ -1541,9 +1541,9 @@ assert@^1.1.1: util "0.10.3" async@^2.6.2: - version "2.6.3" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" - integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg== + version "2.6.4" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" + integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== dependencies: lodash "^4.17.14"