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

Let's do this in a separate branch

Browse Source
This commit is contained in:
James Cole 2020-12-20 10:41:55 +01:00
parent bb86ef5683
commit 4ebfc33b39
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
4 changed files with 192 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
composer.json
View File

@ -84,11 +84,13 @@
"ext-xml": "*", "ext-xml": "*",
"bacon/bacon-qr-code": "2.*", "bacon/bacon-qr-code": "2.*",
"diglactic/laravel-breadcrumbs": "^6.0", "diglactic/laravel-breadcrumbs": "^6.0",
"directorytree/ldaprecord-laravel": "^1.7",
"doctrine/dbal": "2.*", "doctrine/dbal": "2.*",
"fideloper/proxy": "4.*", "fideloper/proxy": "4.*",
"gdbots/query-parser": "^2.0", "gdbots/query-parser": "^2.0",
"guzzlehttp/guzzle": "^7.2", "guzzlehttp/guzzle": "^7.2",
"jc5/google2fa-laravel": "2.0.5", "jc5/google2fa-laravel": "2.0.5",
"jc5/recovery": "^2",
"laravel/framework": "^8.0", "laravel/framework": "^8.0",
"laravel/passport": "10.*", "laravel/passport": "10.*",
"laravel/ui": "^3.0", "laravel/ui": "^3.0",
@ -97,7 +99,6 @@
"league/csv": "^9.6", "league/csv": "^9.6",
"league/fractal": "0.*", "league/fractal": "0.*",
"pragmarx/google2fa": "^8.0", "pragmarx/google2fa": "^8.0",
"jc5/recovery": "^2",
"predis/predis": "^1.1", "predis/predis": "^1.1",
"ramsey/uuid": "^4.1", "ramsey/uuid": "^4.1",
"rcrowe/twigbridge": "^0.12.1" "rcrowe/twigbridge": "^0.12.1"
@ -119,7 +120,7 @@
"vimeo/psalm": "^4.1" "vimeo/psalm": "^4.1"
}, },
"suggest": { "suggest": {
"directorytree/ldaprecord-laravel": "If you want to login using LDAP.", "adldap2/adldap2-laravel": "If you want to login using LDAP.",
"ext-ldap": "Needed to support LDAP." "ext-ldap": "Needed to support LDAP."
}, },
"autoload": { "autoload": {

190
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "ebf74d2d8cc72a1142900024d05b3153", "content-hash": "febd28685917d46d35cbc49fc7a2f209",
"packages": [ "packages": [
{ {
"name": "bacon/bacon-qr-code", "name": "bacon/bacon-qr-code",
@ -300,6 +300,140 @@
}, },
"time": "2020-11-26T19:36:31+00:00" "time": "2020-11-26T19:36:31+00:00"
}, },
{
"name": "directorytree/ldaprecord",
"version": "v1.12.4",
"source": {
"type": "git",
"url": "https://github.com/DirectoryTree/LdapRecord.git",
"reference": "27d3ea80ba837db2f3c1a2ae9d7f3cf99b5dc135"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/DirectoryTree/LdapRecord/zipball/27d3ea80ba837db2f3c1a2ae9d7f3cf99b5dc135",
"reference": "27d3ea80ba837db2f3c1a2ae9d7f3cf99b5dc135",
"shasum": ""
},
"require": {
"ext-json": "*",
"ext-ldap": "*",
"illuminate/contracts": "^5.0|^6.0|^7.0|^8.0",
"nesbot/carbon": "^1.0|^2.0",
"php": ">=7.2",
"psr/log": "^1.0",
"psr/simple-cache": "^1.0",
"tightenco/collect": "^5.0|^6.0|^7.0|^8.0"
},
"require-dev": {
"mockery/mockery": "^1.0",
"phpunit/phpunit": "^8.0"
},
"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": "2020-12-15T00:46:40+00:00"
},
{
"name": "directorytree/ldaprecord-laravel",
"version": "v1.7.5",
"source": {
"type": "git",
"url": "https://github.com/DirectoryTree/LdapRecord-Laravel.git",
"reference": "6a090f285e793dc9c3d72035cfc39ece67dd749e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/DirectoryTree/LdapRecord-Laravel/zipball/6a090f285e793dc9c3d72035cfc39ece67dd749e",
"reference": "6a090f285e793dc9c3d72035cfc39ece67dd749e",
"shasum": ""
},
"require": {
"directorytree/ldaprecord": "^v1.12.4",
"ext-ldap": "*",
"illuminate/support": "^5.6|^6.0|^7.0|^8.0",
"php": ">=7.2"
},
"require-dev": {
"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/v1.7.5"
},
"funding": [
{
"url": "https://github.com/stevebauman",
"type": "github"
}
],
"time": "2020-12-15T00:57:22+00:00"
},
{ {
"name": "doctrine/cache", "name": "doctrine/cache",
"version": "1.10.2", "version": "1.10.2",
@ -6537,6 +6671,60 @@
], ],
"time": "2020-12-16T17:02:19+00:00" "time": "2020-12-16T17:02:19+00:00"
}, },
{
"name": "tightenco/collect",
"version": "v8.19.0",
"source": {
"type": "git",
"url": "https://github.com/tighten/collect.git",
"reference": "0c0243a0dc0b66f54d0ec409f36cd9889665b132"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/tighten/collect/zipball/0c0243a0dc0b66f54d0ec409f36cd9889665b132",
"reference": "0c0243a0dc0b66f54d0ec409f36cd9889665b132",
"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.19.0"
},
"time": "2020-12-19T00:06:29+00:00"
},
{ {
"name": "tijsverkoyen/css-to-inline-styles", "name": "tijsverkoyen/css-to-inline-styles",
"version": "2.2.3", "version": "2.2.3",

0
config/old_ldap.php → config/ldap.php
View File

0
config/old_ldap_auth.php → config/ldap_auth.php
View File