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
..
Helpers	Revert "Define test classes as final"	2024-08-06 13:31:17 -07:00
Listeners	Revert "Define test classes as final"	2024-08-06 13:31:17 -07:00
Models	Revert "Define test classes as final"	2024-08-06 13:31:17 -07:00
AccessoryTest.php	Revert "Define test classes as final"	2024-08-06 13:31:17 -07:00
AssetMaintenanceTest.php	Revert "Define test classes as final"	2024-08-06 13:31:17 -07:00
AssetModelTest.php	Revert "Define test classes as final"	2024-08-06 13:31:17 -07:00
AssetTest.php	Removed extra debugging in test	2024-08-19 11:57:40 +01:00
CategoryTest.php	Remove MBP constraint	2024-08-16 10:36:35 +01:00
CompanyScopingTest.php	Revert "Define test classes as final"	2024-08-06 13:31:17 -07:00
ComponentTest.php	Revert "Define test classes as final"	2024-08-06 13:31:17 -07:00
CustomFieldTest.php	Revert "Define test classes as final"	2024-08-06 13:31:17 -07:00
DepreciationTest.php	Removed MBP constraint on model	2024-08-16 10:35:42 +01:00
LdapTest.php	Revert "Define test classes as final"	2024-08-06 13:31:17 -07:00
LocationTest.php	Revert "Define test classes as final"	2024-08-06 13:31:17 -07:00
NotificationTest.php	adds test	2024-09-04 12:21:49 -07:00
ReportTemplateTest.php	Uncheck a couple boxes by default to match existing behavior	2024-01-18 13:30:51 -08:00
SnipeModelTest.php	Revert "Define test classes as final"	2024-08-06 13:31:17 -07:00
SnipeTranslatorTest.php	Revert "Define test classes as final"	2024-08-06 13:31:17 -07:00
StatuslabelTest.php	Revert "Define test classes as final"	2024-08-06 13:31:17 -07:00
UserTest.php	Revert "Define test classes as final"	2024-08-06 13:31:17 -07:00