Godfrey M ee31bfbcd4 Merge branch 'develop' into checkin_non_reassignable_license ...

# Conflicts:
#	app/Helpers/Helper.php
#	app/Http/Controllers/Api/LicenseSeatsController.php
#	app/Http/Transformers/LicensesTransformer.php

2025-04-21 10:49:35 -07:00

..

Controllers

Merge branch 'develop' into checkin_non_reassignable_license

2025-04-21 10:49:35 -07:00

Middleware

Squashed commit of the following:

2024-11-12 15:39:22 +00:00

Requests

Improve Settings: Remove username and password requirement for ldap

2025-04-08 11:04:37 +02:00

Traits

improved reports query, could be further optimized

2025-01-07 15:06:09 -08:00

Transformers

Merge branch 'develop' into checkin_non_reassignable_license

2025-04-21 10:49:35 -07:00

Kernel.php

Squashed commit of the following:

2024-11-12 15:39:22 +00:00