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 
# Conflicts:
#	frontend/yarn.lock
This commit is contained in:
James Cole 2021-07-05 20:02:07 +02:00
commit 48fdd50428
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
3 changed files with 10 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -111,7 +111,7 @@
"fakerphp/faker": "1.*",
"mockery/mockery": "1.*",
"nunomaduro/larastan": "^0.7.0",
"phpstan/phpstan": "^0.12.34",
"phpstan/phpstan": "^0.12.91",
"phpstan/phpstan-deprecation-rules": "^0.12.5",
"phpunit/phpunit": "^9.5",
"roave/security-advisories": "dev-master",

205
composer.lock generated
View File

@ -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": "0019b285c24678c7040e6f0724d449b6",
"content-hash": "471d7f653305307f4731feecf1f0ea99",
"packages": [
{
"name": "bacon/bacon-qr-code",
@ -372,143 +372,6 @@
},
"time": "2021-05-23T16:43:52+00:00"
},
{
"name": "directorytree/ldaprecord",
"version": "v2.5.3",
"source": {
"type": "git",
"url": "https://github.com/DirectoryTree/LdapRecord.git",
"reference": "cca4bcef8b4cdcb4f03beb11d876eaf322511bfd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/DirectoryTree/LdapRecord/zipball/cca4bcef8b4cdcb4f03beb11d876eaf322511bfd",
"reference": "cca4bcef8b4cdcb4f03beb11d876eaf322511bfd",
"shasum": ""
},
"require": {
"ext-json": "*",
"ext-ldap": "*",
"illuminate/contracts": "^5.0|^6.0|^7.0|^8.0",
"nesbot/carbon": "^1.0|^2.0",
"php": ">=7.3",
"psr/log": "^1.0",
"psr/simple-cache": "^1.0",
"tightenco/collect": "^5.6|^6.0|^7.0|^8.0"
},
"require-dev": {
"mockery/mockery": "^1.0",
"phpunit/phpunit": "^8.0",
"spatie/ray": "^1.24"
},
"type": "library",
"autoload": {
"psr-4": {
"LdapRecord\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Steve Bauman",
"email": "steven_bauman@outlook.com",
"role": "Developer"
}
],
"description": "A fully-featured LDAP ORM.",
"homepage": "https://www.ldaprecord.com",
"keywords": [
"active directory",
"ad",
"adLDAP",
"adldap2",
"directory",
"ldap",
"ldaprecord",
"orm",
"windows"
],
"support": {
"docs": "https://ldaprecord.com",
"email": "steven_bauman@outlook.com",
"issues": "https://github.com/DirectoryTree/LdapRecord/issues",
"source": "https://github.com/DirectoryTree/LdapRecord"
},
"funding": [
{
"url": "https://github.com/stevebauman",
"type": "github"
}
],
"time": "2021-06-25T20:26:27+00:00"
},
{
"name": "directorytree/ldaprecord-laravel",
"version": "v2.3.3",
"source": {
"type": "git",
"url": "https://github.com/DirectoryTree/LdapRecord-Laravel.git",
"reference": "81f4d8a6336bfd9fb59f61d1db1c01faa9e44d46"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/DirectoryTree/LdapRecord-Laravel/zipball/81f4d8a6336bfd9fb59f61d1db1c01faa9e44d46",
"reference": "81f4d8a6336bfd9fb59f61d1db1c01faa9e44d46",
"shasum": ""
},
"require": {
"directorytree/ldaprecord": "^2.4.4",
"ext-ldap": "*",
"illuminate/support": "^5.6|^6.0|^7.0|^8.0",
"php": ">=7.2",
"ramsey/uuid": "*"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.0",
"mockery/mockery": "~1.0",
"orchestra/testbench": "~3.7|~4.0|~5.0|~6.0",
"phpunit/phpunit": "~7.0|~8.0|~9.0"
},
"type": "project",
"extra": {
"laravel": {
"providers": [
"LdapRecord\\Laravel\\LdapServiceProvider",
"LdapRecord\\Laravel\\LdapAuthServiceProvider"
]
}
},
"autoload": {
"psr-4": {
"LdapRecord\\Laravel\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "LDAP Authentication & Management for Laravel.",
"keywords": [
"adldap2",
"laravel",
"ldap",
"ldaprecord"
],
"support": {
"issues": "https://github.com/DirectoryTree/LdapRecord-Laravel/issues",
"source": "https://github.com/DirectoryTree/LdapRecord-Laravel/tree/v2.3.3"
},
"funding": [
{
"url": "https://github.com/stevebauman",
"type": "github"
}
],
"time": "2021-05-30T23:04:22+00:00"
},
{
"name": "doctrine/cache",
"version": "2.0.3",
@ -6859,60 +6722,6 @@
],
"time": "2021-06-24T08:13:00+00:00"
},
{
"name": "tightenco/collect",
"version": "v8.34.0",
"source": {
"type": "git",
"url": "https://github.com/tighten/collect.git",
"reference": "b069783ab0c547bb894ebcf8e7f6024bb401f9d2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/tighten/collect/zipball/b069783ab0c547bb894ebcf8e7f6024bb401f9d2",
"reference": "b069783ab0c547bb894ebcf8e7f6024bb401f9d2",
"shasum": ""
},
"require": {
"php": "^7.2|^8.0",
"symfony/var-dumper": "^3.4 || ^4.0 || ^5.0"
},
"require-dev": {
"mockery/mockery": "^1.0",
"nesbot/carbon": "^2.23.0",
"phpunit/phpunit": "^8.3"
},
"type": "library",
"autoload": {
"files": [
"src/Collect/Support/helpers.php",
"src/Collect/Support/alias.php"
],
"psr-4": {
"Tightenco\\Collect\\": "src/Collect"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Taylor Otwell",
"email": "taylorotwell@gmail.com"
}
],
"description": "Collect - Illuminate Collections as a separate package.",
"keywords": [
"collection",
"laravel"
],
"support": {
"issues": "https://github.com/tighten/collect/issues",
"source": "https://github.com/tighten/collect/tree/v8.34.0"
},
"time": "2021-03-29T21:29:00+00:00"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
"version": "2.2.3",
@ -9042,16 +8851,16 @@
},
{
"name": "phpstan/phpstan",
"version": "0.12.90",
"version": "0.12.91",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "f0e4b56630fc3d4eb5be86606d07212ac212ede4"
"reference": "8226701cd228a0d63c2df995de7ab6070c69ac6a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/f0e4b56630fc3d4eb5be86606d07212ac212ede4",
"reference": "f0e4b56630fc3d4eb5be86606d07212ac212ede4",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/8226701cd228a0d63c2df995de7ab6070c69ac6a",
"reference": "8226701cd228a0d63c2df995de7ab6070c69ac6a",
"shasum": ""
},
"require": {
@ -9082,7 +8891,7 @@
"description": "PHPStan - PHP Static Analysis Tool",
"support": {
"issues": "https://github.com/phpstan/phpstan/issues",
"source": "https://github.com/phpstan/phpstan/tree/0.12.90"
"source": "https://github.com/phpstan/phpstan/tree/0.12.91"
},
"funding": [
{
@ -9102,7 +8911,7 @@
"type": "tidelift"
}
],
"time": "2021-06-18T07:15:38+00:00"
"time": "2021-07-04T15:31:48+00:00"
},
{
"name": "phpstan/phpstan-deprecation-rules",

4
frontend/package.json
View File

@ -20,7 +20,7 @@
"sass": "^1.32.8",
"sass-loader": "^12.0.0",
"vue-i18n": "^8.24.2",
"vue-loader": "^15.9.5",
"vue-loader": "^16.3.0",
"vue-template-compiler": "^2.6.12",
"vuex": "^3.6.2",
"webpack": "^5.40.0"
@ -38,7 +38,7 @@
"localforage": "^1.9.0",
"localforage-memoryStorageDriver": "^0.9.2",
"overlayscrollbars": "^1.13.1",
"sortablejs": "^1.13.0",
"sortablejs": "^1.14.0",
"v-calendar": "^2.3.0",
"vue-typeahead-bootstrap": "^2.8.0",
"vue2-leaflet": "^2.7.1"