Marcus Moore 8bba11e1bb Merge branch 'develop' into saving_custom_report_template ... # Conflicts: # app/Http/Controllers/ReportsController.php # resources/views/partials/forms/edit/category-select.blade.php # resources/views/partials/forms/edit/company-select.blade.php # resources/views/partials/forms/edit/location-select.blade.php # resources/views/partials/forms/edit/manufacturer-select.blade.php # resources/views/partials/forms/edit/model-select.blade.php # resources/views/partials/forms/edit/status-select.blade.php # resources/views/reports/custom.blade.php		2024-09-17 15:26:35 -07:00
..
Controllers	Merge branch 'develop' into saving_custom_report_template	2024-09-17 15:26:35 -07:00
Middleware
Requests	Validation rules to prevent switchng user companies if assets are assigned	2024-08-29 14:55:18 +01:00
Traits	Fixed behavior for null model numbers	2024-08-17 00:27:44 +01:00
Transformers	Added counts to depreciation transformer	2024-08-28 12:39:43 +01:00
Kernel.php	fixed #15374: load TrustProxies middleware in Kernel.php	2024-08-22 23:41:27 +02:00