snipe 12ae408830 Merge remote-tracking branch 'origin/develop' ...

# Conflicts:
#	app/Http/Controllers/Auth/ResetPasswordController.php
#	resources/views/auth/passwords/reset.blade.php

2020-10-19 16:40:07 -07:00

..

Console

Modify Snipe-IT v5 AD handling to use the same ldap_host, and improve OU handling

2020-10-06 18:31:06 -07:00

Events

Assorted licenses UI fixes while testing.

2020-05-12 14:38:21 -04:00

Exceptions

Fix invalidJSON exception

2019-08-14 22:18:48 -07:00

Helpers

Refactor big switch to lookup in array. A bit cleaner/codacy happier.

2020-05-23 12:17:56 -04:00

Http

Merge remote-tracking branch 'origin/develop'

2020-10-19 16:40:07 -07:00

Importer

Squashed commit of the following:

2020-08-31 12:17:19 -07: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 checkin/checkout notification crashing

2020-09-11 16:10:18 -07:00

Models

Fixed #8526 - skip cache for setup check

2020-10-19 12:33:38 -07:00

Notifications

Removed SlackTest notification

2020-09-15 23:05:05 -07:00

Observers

Minor code cleanup bits and bobs (#6805)

2019-03-13 20:12:03 -07:00

Policies

Clean up Transformers and extract an isDeletable() method to models where it makes sense.

2020-05-23 15:24:10 -04:00

Presenters

Added checkin_email to category listing

2020-09-11 16:06:38 -07:00

Providers

[WIP] fix ldap-sync for v5 with AdLdap2

2020-08-14 14:45:05 -07:00

Services

Ensure misdefined active flags will not prevent user syncing

2020-10-15 19:10:47 -07:00