From 488015ba5e7ef0454d36077e8cba3642f0e0fa19 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 8 Mar 2022 21:51:25 -0700 Subject: [PATCH] Update changelog --- CHANGELOG.md | 1 + composer.json | 1 - composer.lock | 139 +------------------------------------------------- 3 files changed, 2 insertions(+), 139 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d373fb025..dfef31bee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Added - Custom Emoji ([#3166](https://github.com/pixelfed/pixelfed/pull/3166)) +- LDAP Authentication ([#3296](https://github.com/pixelfed/pixelfed/pull/3296)) ### Metro 2.0 UI - Added Hovercards ([16ced7b4](https://github.com/pixelfed/pixelfed/commit/16ced7b4)) diff --git a/composer.json b/composer.json index 37ea44ced..aeb269e36 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,6 @@ "bacon/bacon-qr-code": "^2.0.3", "brick/math": "^0.8", "buzz/laravel-h-captcha": "1.0.2", - "directorytree/ldaprecord-laravel": "^2.5", "doctrine/dbal": "^2.7", "fideloper/proxy": "^4.0", "fruitcake/laravel-cors": "^2.0", diff --git a/composer.lock b/composer.lock index 8ed63f719..80840b605 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "946f8335440aef533250756003527450", + "content-hash": "3c21217e74cf762827c63ab922e9f046", "packages": [ { "name": "alchemy/binary-driver", @@ -634,143 +634,6 @@ }, "time": "2021-08-13T13:06:58+00:00" }, - { - "name": "directorytree/ldaprecord", - "version": "v2.11.0", - "source": { - "type": "git", - "url": "https://github.com/DirectoryTree/LdapRecord.git", - "reference": "1ac0c94fa819c0de3176d886ce7cbf6f1cbc0252" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/DirectoryTree/LdapRecord/zipball/1ac0c94fa819c0de3176d886ce7cbf6f1cbc0252", - "reference": "1ac0c94fa819c0de3176d886ce7cbf6f1cbc0252", - "shasum": "" - }, - "require": { - "ext-json": "*", - "ext-ldap": "*", - "illuminate/contracts": "^5.0|^6.0|^7.0|^8.0|^9.0", - "nesbot/carbon": "^1.0|^2.0", - "php": ">=7.3", - "psr/log": "*", - "psr/simple-cache": "^1.0|^2.0", - "tightenco/collect": "^5.6|^6.0|^7.0|^8.0" - }, - "require-dev": { - "mockery/mockery": "^1.0", - "phpunit/phpunit": "^9.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": "2022-03-08T14:16:44+00:00" - }, - { - "name": "directorytree/ldaprecord-laravel", - "version": "v2.5.4", - "source": { - "type": "git", - "url": "https://github.com/DirectoryTree/LdapRecord-Laravel.git", - "reference": "6283cac3ee5df4817eafdd1f145f72c6861b3a76" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/DirectoryTree/LdapRecord-Laravel/zipball/6283cac3ee5df4817eafdd1f145f72c6861b3a76", - "reference": "6283cac3ee5df4817eafdd1f145f72c6861b3a76", - "shasum": "" - }, - "require": { - "directorytree/ldaprecord": "^2.4.4", - "ext-ldap": "*", - "illuminate/support": "^5.6|^6.0|^7.0|^8.0|^9.0", - "php": ">=7.3", - "ramsey/uuid": "*" - }, - "require-dev": { - "mockery/mockery": "^1.0", - "orchestra/testbench": "^3.7|^4.0|^5.0|^6.0|^7.0", - "phpunit/phpunit": "^7.0|^8.0|^9.0", - "spatie/ray": "^1.28" - }, - "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.5.4" - }, - "funding": [ - { - "url": "https://github.com/stevebauman", - "type": "github" - } - ], - "time": "2022-02-09T14:41:23+00:00" - }, { "name": "doctrine/cache", "version": "2.1.1",