kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-22 12:11:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into develop

Browse Source
This commit is contained in:
James Cole
2021-06-30 19:38:35 +02:00
parent 8bf0eaf969 0fed21e831
commit a952ba5411
11 changed files with 268 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/package.json
View File

@@ -13,7 +13,7 @@
"axios": "^0.21", "axios": "^0.21",
"date-fns": "^2.21.1", "date-fns": "^2.21.1",
"laravel-mix": "^6", "laravel-mix": "^6",
"lodash": "^4.17.19", "lodash": "^4.17.21",
"lodash.clonedeep": "^4.5.0", "lodash.clonedeep": "^4.5.0",
"postcss": "^8.1.14", "postcss": "^8.1.14",
"resolve-url-loader": "^4.0.0", "resolve-url-loader": "^4.0.0",

8
frontend/yarn.lock
View File

@@ -2079,9 +2079,9 @@ color-name@^1.0.0, color-name@~1.1.4:
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
colord@^2.0.1: colord@^2.0.1:
version "2.0.1" version "2.1.0"
resolved "https://registry.yarnpkg.com/colord/-/colord-2.0.1.tgz#1e7fb1f9fa1cf74f42c58cb9c20320bab8435aa0" resolved "https://registry.yarnpkg.com/colord/-/colord-2.1.0.tgz#28cd9d6ac874dff97ef5ec1432c5c0b4e58e49c7"
integrity sha512-vm5YpaWamD0Ov6TSG0GGmUIwstrWcfKQV/h2CmbR7PbNu41+qdB5PW9lpzhjedrpm08uuYvcXi0Oel1RLZIJuA== integrity sha512-H5sDP9XDk2uP+x/xSGkgB9SEFc1bojdI5DMKU0jmSXQtml2GIe48dj1DcSS0e53QQAHn+JKqUXbGeGX24xWD7w==
colorette@^1.2.1, colorette@^1.2.2: colorette@^1.2.1, colorette@^1.2.2:
version "1.2.2" version "1.2.2"
@@ -4370,7 +4370,7 @@ lodash@4.17.20:
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21: lodash@^4.17.14, lodash@^4.17.20, lodash@^4.17.21:
version "4.17.21" version "4.17.21"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==

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.12 * Vue.js v2.6.14
* (c) 2014-2020 Evan You * (c) 2014-2021 Evan You
* Released under the MIT License. * 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

2
public/v2/js/vendor.js vendored
View File

File diff suppressed because one or more lines are too long

6
public/v2/js/vendor.js.LICENSE.txt
View File

@@ -60,12 +60,6 @@
* Date: 2021-02-16 * Date: 2021-02-16
*/ */
/*!
* Vue.js v2.6.13
* (c) 2014-2021 Evan You
* Released under the MIT License.
*/
/*! /*!
* Vue.js v2.6.14 * Vue.js v2.6.14
* (c) 2014-2021 Evan You * (c) 2014-2021 Evan You

2
public/v2/js/vendor.js.map
View File

File diff suppressed because one or more lines are too long

677
yarn.lock
View File

File diff suppressed because it is too large Load Diff