IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop

Browse Source
This commit is contained in:
James Cole 2020-10-26 16:52:34 +01:00
commit e83fdc58ff
6 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Support/Amount.php
View File

@ -350,6 +350,7 @@ class Amount
try {
$value = Crypt::decrypt($value); // verified
} catch (DecryptException $e) {
// ignore decryption error.
}
return $value;

10
composer.lock generated
View File

@ -8974,16 +8974,16 @@
},
{
"name": "phpstan/phpstan",
"version": "0.12.51",
"version": "0.12.52",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "b430527cd7b956324bcd554fb85a5e2fd43177d6"
"reference": "e96dd5e7ae9aefed663bc7e285ad96792b67eadc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/b430527cd7b956324bcd554fb85a5e2fd43177d6",
"reference": "b430527cd7b956324bcd554fb85a5e2fd43177d6",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/e96dd5e7ae9aefed663bc7e285ad96792b67eadc",
"reference": "e96dd5e7ae9aefed663bc7e285ad96792b67eadc",
"shasum": ""
},
"require": {
@ -9026,7 +9026,7 @@
"type": "tidelift"
}
],
"time": "2020-10-23T11:58:04+00:00"
"time": "2020-10-25T07:23:44+00:00"
},
{
"name": "phpstan/phpstan-deprecation-rules",

14
frontend/package-lock.json generated Executable file → Normal file
View File

@ -1626,20 +1626,12 @@
}
},
"axios": {
"version": "0.20.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.20.0.tgz",
"integrity": "sha512-ANA4rr2BDcmmAQLOKft2fufrtuvlqR+cXNNinUmvfeSNCOF98PZL+7M/v1zIdGo7OLjEA9J2gXJL+j4zGsl0bA==",
"version": "0.21.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.21.0.tgz",
"integrity": "sha512-fmkJBknJKoZwem3/IKSSLpkdNXZeBu5Q7GA/aRsr2btgrptmSCxi2oFjZHqGdK9DoTil9PIHlPIZw2EcRJXRvw==",
"dev": true,
"requires": {
"follow-redirects": "^1.10.0"
},
"dependencies": {
"follow-redirects": {
"version": "1.13.0",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
"integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==",
"dev": true
}
}
},
"babel-code-frame": {

2
frontend/package.json Executable file → Normal file
View File

@ -10,7 +10,7 @@
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
},
"devDependencies": {
"axios": "^0.20",
"axios": "^0.21",
"cross-env": "^7.0",
"laravel-mix": "^5.0.7",
"laravel-mix-bundle-analyzer": "^1.0.5",

2
package.json
View File

@ -11,7 +11,7 @@
},
"devDependencies": {
"@johmun/vue-tags-input": "^2.1.0",
"axios": "^0.20.0",
"axios": "^0.21.0",
"bootstrap-sass": "^3.3.7",
"cross-env": "^7.0",
"font-awesome": "^4.7.0",

14
yarn.lock
View File

@ -1286,10 +1286,10 @@ autoprefixer@^9.4.2:
postcss "^7.0.32"
postcss-value-parser "^4.1.0"
axios@^0.20.0:
version "0.20.0"
resolved "https://registry.yarnpkg.com/axios/-/axios-0.20.0.tgz#057ba30f04884694993a8cd07fa394cff11c50bd"
integrity sha512-ANA4rr2BDcmmAQLOKft2fufrtuvlqR+cXNNinUmvfeSNCOF98PZL+7M/v1zIdGo7OLjEA9J2gXJL+j4zGsl0bA==
axios@^0.21.0:
version "0.21.0"
resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.0.tgz#26df088803a2350dff2c27f96fef99fe49442aca"
integrity sha512-fmkJBknJKoZwem3/IKSSLpkdNXZeBu5Q7GA/aRsr2btgrptmSCxi2oFjZHqGdK9DoTil9PIHlPIZw2EcRJXRvw==
dependencies:
follow-redirects "^1.10.0"
@ -6333,9 +6333,9 @@ uglify-js@3.4.x:
source-map "~0.6.1"
uiv@^1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/uiv/-/uiv-1.1.1.tgz#b747b18781f95a77b5215957dc21d34caedb320b"
integrity sha512-Ny8koCu1jJt83jZAiFIRe0DS6C0fQ2RGV1BevKR6z8ILOwvoqKLWoM/solvU+zWcwLxYVeg0PXpj+ZCiKRONuw==
version "1.1.2"
resolved "https://registry.yarnpkg.com/uiv/-/uiv-1.1.2.tgz#02a074d2a95bfb446d9c3e524dd62492e19b2151"
integrity sha512-T+UVykoEUG3C9qvpFGnWozcIl/nkM/vuP5UpncDAkf8aB202eWJJ9TNAVKyvpvu6igBe85D5hnsd66cNuFtp+Q==
dependencies:
portal-vue "^2.1.7"
vue-functional-data-merge "^3.0.0"