snipe cdd0e405be Fixed weird merge ...

Signed-off-by: snipe <snipe@snipe.net>

2020-04-22 07:12:29 -07:00

..

Console

Merge branch 'develop' into integrations/2020-04-15-v5-merge

2020-04-20 23:20:34 -07:00

Events

Valo/checkin date in history of asset (#6733)

2019-03-13 21:36:32 -07:00

Exceptions

Fix invalidJSON exception

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

Helpers

Fixed more camel-casing -> snake-casing

2019-05-24 16:01:12 -07:00

Http

Fixed weird merge

2020-04-22 07:12:29 -07:00

Importer

Merge branch 'develop' into integrations/2020-04-15-v5-merge

2020-04-20 23:20:34 -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

Valo/checkin date in history of asset (#6733)

2019-03-13 21:36:32 -07:00

Models

Added type casting and a few more validation rules

2020-04-22 06:37:40 -07:00

Notifications

Fixes PSR autoloading issue

2020-04-21 20:15:24 -07:00

Observers

Minor code cleanup bits and bobs (#6805)

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

Policies

Integrations/develop into master (#7352)

2019-08-14 21:48:14 -07:00

Presenters

Merge branch 'develop' into integrations/2020-04-15-v5-merge

2020-04-20 23:20:34 -07:00

Providers

Add image upload to user edit [ch10508] (#7877)

2020-03-05 18:00:24 -08:00

Services

Added: allow appending of domain name to username when user tries to login (#7790)

2020-02-04 12:47:49 -08:00