IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-01-12 17:12:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into 5.8-dev

Browse Source 
# Conflicts:
#	composer.lock
#	yarn.lock
This commit is contained in:
James Cole 2022-07-09 17:25:39 +02:00
commit 9118a153d5
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
8 changed files with 201 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
composer.json
View File

@ -96,14 +96,14 @@
"league/commonmark": "2.*",
"league/csv": "^9.7",
"league/fractal": "0.*",
"nunomaduro/collision": "^6.1",
"nunomaduro/collision": "^6.2",
"pragmarx/google2fa": "^8.0",
"predis/predis": "^1.1",
"predis/predis": "^2.0",
"psr/log": "<4",
"ramsey/uuid": "^4.3",
"rcrowe/twigbridge": "^0.14",
"spatie/data-transfer-object": "^3.8",
"spatie/laravel-ignition": "^1.2",
"spatie/laravel-ignition": "^1.3",
"symfony/http-client": "^6.0",
"symfony/mailgun-mailer": "^6.0"
},

371
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -10,7 +10,7 @@
},
"devDependencies": {
"@johmun/vue-tags-input": "^2",
"@vue/compiler-sfc": "^3.2.36",
"@vue/compiler-sfc": "^3.2.37",
"axios": "^0.27",
"bootstrap-sass": "^3",
"cross-env": "^7.0",

2
public/v1/js/app_vue.js vendored
View File

File diff suppressed because one or more lines are too long

4
public/v1/js/app_vue.js.LICENSE.txt
View File

@ -1,5 +1,5 @@
/*!
* Vue.js v2.6.14
* (c) 2014-2021 Evan You
* Vue.js v2.7.2
* (c) 2014-2022 Evan You
* Released under the MIT License.
*/

2
public/v1/js/create_transaction.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/edit_transaction.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/profile.js vendored
View File

File diff suppressed because one or more lines are too long