snipe-it/app
snipe b876d0abb0 Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.env.example
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Kernel.php
#	app/Http/Transformers/ActionlogsTransformer.php
#	app/Importer/AssetImporter.php
#	app/Models/Accessory.php
#	app/Models/Consumable.php
#	app/Presenters/AccessoryPresenter.php
#	app/Presenters/ComponentPresenter.php
#	app/Presenters/ConsumablePresenter.php
#	app/Providers/AuthServiceProvider.php
#	composer.json
#	composer.lock
#	config/app.php
#	config/cors.php
#	config/version.php
#	package-lock.json
#	public/js/build/app.js
#	public/js/build/app.js.LICENSE.txt
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/views/accessories/view.blade.php
#	resources/views/consumables/view.blade.php
#	resources/views/settings/saml.blade.php
#	routes/api.php
2022-03-03 21:59:38 -08:00
..
Console Switch to searching on semicolon instead of & 2022-02-09 15:55:22 -08:00
Events Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
Exceptions Merge remote-tracking branch 'origin/master' into develop 2022-03-03 21:59:38 -08:00
Helpers Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
Http Merge remote-tracking branch 'origin/master' into develop 2022-03-03 21:59:38 -08:00
Importer Merge remote-tracking branch 'origin/master' into develop 2022-03-03 21:59:38 -08:00
Jobs Version 3 - hold onto your butts 2016-03-25 01:18:05 -07:00
LegacyEncrypter Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Listeners Fixed notification tests 2021-12-02 20:01:03 -08:00
Models Merge remote-tracking branch 'origin/master' into develop 2022-03-03 21:59:38 -08:00
Notifications Fixed notification tests 2021-12-02 20:01:03 -08:00
Observers Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
Policies Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
Presenters Merge remote-tracking branch 'origin/master' into develop 2022-03-03 21:59:38 -08:00
Providers Merge remote-tracking branch 'origin/master' into develop 2022-03-03 21:59:38 -08:00
Services Add new UserAccountControl to permitted UAC's for AD. 2022-01-12 12:07:51 -08:00