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

..

AccessoriesController.php

Merge pull request #16435 from marcusmoore/fixes/prevent-deleting-accessories-with-checkouts

2025-04-19 14:38:14 +01:00

AssetFilesController.php

Fixed asset file listing display at API endpoint

2025-04-09 05:53:24 +01:00

AssetMaintenancesController.php

Updated return types

2024-12-26 10:18:00 +00:00

AssetModelFilesController.php

Use transformer for model files

2025-01-20 20:20:35 +00:00

AssetModelsController.php

Added name, model_number and notes for strict search

2025-02-26 12:43:54 +00:00

AssetsController.php

Merge branch 'chore/sc-28495' into develop

2025-04-19 14:29:30 +01:00

CategoriesController.php

Added notes to API controllers

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

CheckoutRequest.php

Refactor CheckoutRequest actions for consistency

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

CompaniesController.php

Fixed query duplication for AssetsForShow scope

2025-02-18 16:18:12 +00:00

ComponentsController.php

Fixed ambiguous clause using company_id

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

ConsumablesController.php

Fixed ambiguous clause using company_id

2025-04-17 11:56:39 +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

Complete failed-transliteration test, clean up error, new translation string

2025-02-27 16:10:56 +00: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-04-21 10:49:35 -07:00

LocationsController.php

Merge branch 'develop' into feature/locations_with_companies

2025-04-08 09:18:48 +01:00

ManufacturersController.php

Added notes to API controllers

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

PredefinedKitsController.php

Squashed commit of the following:

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

ProfileController.php

Fixed API key missing translations

2024-07-09 13:17:46 +01:00

ReportsController.php

Removed extra sort

2024-11-14 14:41:11 +00:00

SettingsController.php

More type-hinting

2024-07-05 07:07:20 +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

More type-hinting

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

UsersController.php

Added email as searchable field in select list

2025-04-15 15:45:25 +01:00