Marcus Moore 5306e1cd15 Merge branch 'develop' into saving_custom_report_template ... # Conflicts: # 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/supplier-select.blade.php # resources/views/reports/custom.blade.php		2024-10-15 12:32:01 -07:00
..
accessories.blade.php	Actually display name of company in Accessories Report	2023-03-01 11:34:30 -08:00
activity.blade.php	Changed action_date to created_at	2024-09-25 17:25:15 +01:00
asset.blade.php	Update views with additional data fields	2022-06-05 21:03:56 -07:00
asset_maintenances.blade.php	Fixed case in BS table formatter for boolean	2023-08-14 13:01:32 +01:00
audit.blade.php	fixed audit log image not appearing	2023-06-12 12:10:19 -07:00
custom.blade.php	Merge branch 'develop' into saving_custom_report_template	2024-10-15 12:32:01 -07:00
depreciation.blade.php	Remove another data-toggle="table" - possibly the last one	2022-03-07 12:52:57 -08:00
index.blade.php	Use Helper alias	2021-09-28 19:44:55 -07:00
licenses.blade.php	Use Helper alias	2021-09-28 19:44:55 -07:00
unaccepted_assets.blade.php	Set resend acceptance to POST	2023-10-09 16:13:41 +01:00