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
..
AccessoryFactory.php	added options to checkout accessoires to locations and assets	2024-07-29 10:54:53 +02:00
ActionlogFactory.php	Marcus’ nitpicks	2024-07-03 23:01:41 +01:00
AssetFactory.php	Merge branch 'develop' into bug/sc-24884	2024-07-23 12:55:19 -05:00
AssetMaintenanceFactory.php	Remove unneeded or outdated comments and update imports	2023-03-20 11:39:27 -07:00
AssetModelFactory.php	new test not quite working, almost there	2024-05-01 16:12:56 -05:00
CategoryFactory.php	Modernize use statements, switch to auth()	2024-07-04 20:49:22 +01:00
CheckoutAcceptanceFactory.php	Add CheckoutAcceptance factory	2023-05-03 14:21:13 -07:00
CompanyFactory.php	Add unique() to some factory properties	2023-09-19 17:02:18 -07:00
ComponentFactory.php	Very basic checkin tests	2024-07-26 13:16:31 +01:00
ConsumableFactory.php	Marcus’ nitpicks	2024-07-03 23:01:41 +01:00
CustomFieldFactory.php	Added radio to seeder for custom fields	2023-12-13 14:03:13 +00:00
CustomFieldsetFactory.php	alright, in a working place	2024-05-07 14:08:47 -05:00
DepartmentFactory.php	Generate unique names for departments	2024-02-27 12:47:56 -08:00
DepreciationFactory.php	Add unique() to some factory properties	2023-09-19 17:02:18 -07:00
GroupFactory.php	Remove unneeded or outdated comments and update imports	2023-03-20 11:39:27 -07:00
LicenseFactory.php	Remove unneeded or outdated comments and update imports	2023-03-20 11:39:27 -07:00
LicenseSeatFactory.php	Account for null asset in factory state	2024-04-10 16:12:47 -07:00
LocationFactory.php	Merge branch 'develop' into bug/sc-24884	2024-07-23 12:55:19 -05:00
ManufacturerFactory.php	Add unique() to some factory properties	2023-09-19 17:02:18 -07:00
ReportTemplateFactory.php	Implement some tests	2024-01-17 16:25:28 -08:00
SettingFactory.php	Fixed a few more small localization issues	2023-12-24 20:14:49 +00:00
StatuslabelFactory.php	Scaffold tests around asset checkout via web	2024-03-20 13:29:25 -07:00
SupplierFactory.php	Remove unneeded or outdated comments and update imports	2023-03-20 11:39:27 -07:00
UserFactory.php	Add simple tests for company creation via UI	2024-09-09 11:03:00 -07:00