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

# Conflicts:
#	app/Models/License.php
#	resources/views/licenses/view.blade.php
#	tests/Feature/Checkins/Api/LicenseCheckInTest.php

2025-09-03 11:09:51 -07:00

..

AccessoriesController.php

Added payload to accessories API

2025-09-01 12:23:39 +01:00

AssetModelsController.php

Merge pull request #16947 from Godmartinz/add-require-serial-to-models

2025-09-03 14:53:15 +01:00

AssetsController.php

Merge branch 'develop' into add-display-name-to-users-fixed

2025-08-25 15:28:20 +01:00

CategoriesController.php

Added models to deletable check

2025-05-09 19:17:48 +01:00

CheckoutRequest.php

Refactor CheckoutRequest actions for consistency

2024-12-03 17:51:12 -06:00

CompaniesController.php

Eager load admin

2025-07-07 13:21:07 +01:00

ComponentsController.php

Fixed ambiguous clause using company_id

2025-04-17 11:56:39 +01:00

ConsumablesController.php

Updated ->present()->fullName() to ->display_name

2025-08-25 14:57:34 +01:00

CustomFieldsController.php

More type-hinting

2024-07-05 07:07:20 +01:00

CustomFieldsetsController.php

More type-hinting

2024-07-05 07:07:20 +01:00

DepartmentsController.php

Added notes to API controllers

2025-02-11 00:31:50 +00:00

DepreciationsController.php

Squashed commit of the following:

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

GroupsController.php

Small fix or groups API

2025-04-21 11:49:49 +01:00

ImportController.php

Fixed #17667 - Switch to hyphens for windows

2025-08-20 15:56:10 +01:00

LabelsController.php

More type-hinting

2024-07-05 07:07:20 +01:00

LicensesController.php

Squashed commit of the following:

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

LicenseSeatsController.php

Merge branch 'develop' into checkin_non_reassignable_license

2025-09-03 11:09:51 -07:00

LocationsController.php

Eager load adminuser method

2025-05-29 17:13:16 +01:00

MaintenancesController.php

Renamed more files

2025-08-10 13:24:14 +01:00

ManufacturersController.php

Added notes to API controllers

2025-02-11 00:31:50 +00:00

NotesController.php

Changed NotesController::getList() to NotesController::index() & reordered methods for consistency

2025-07-28 16:57:46 -07:00

PredefinedKitsController.php

Squashed commit of the following:

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

ProfileController.php

Added eula download with user check in profile controller

2025-06-22 19:24:06 +01:00

ReportsController.php

Smal improvements to scoping displays

2025-04-30 15:24:42 +01:00

SettingsController.php

Merge pull request #17723 from uberbrady/improve_ldap_certificate_ignoring

2025-08-27 13:29:33 +01:00

StatuslabelsController.php

Allow pending as an asset status that does not automatically check the asset in

2025-02-26 10:46:38 +00:00

SuppliersController.php

Few more replcamenents

2025-08-10 14:14:21 +01:00

UploadedFilesController.php

Log upload deletion

2025-09-03 08:37:42 +01:00

UsersController.php

Updated fieldname in user API request

2025-09-01 16:17:39 +01:00