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
..
Console	Merge pull request #15375 from Godmartinz/fix-acceptance-reminder-command	2024-08-23 07:31:29 +01:00
Events	Allow admin to be nullable (for cli)	2024-07-03 20:50:35 +01:00
Exceptions	Cleaned up facade names and references	2024-05-29 12:38:15 +01:00
Helpers	Added icon for dept	2024-08-31 13:48:42 +01:00
Http	Merge branch 'develop' into saving_custom_report_template	2024-09-17 15:26:35 -07:00
Importer	Removed some debugging	2024-08-17 00:35:42 +01:00
Jobs
LegacyEncrypter	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
Listeners	added conditional to listener	2024-08-07 16:53:06 -05:00
Livewire	Merge branch 'develop' into fixes/custom-field-values	2024-09-09 16:07:37 -07:00
Models	Merge branch 'develop' into saving_custom_report_template	2024-09-17 15:26:35 -07:00
Notifications	edited terenaries on notifs	2024-08-01 11:13:20 -07:00
Observers	Handle deletions on the observer	2024-07-11 17:26:43 +01:00
Policies	Fixed tests	2024-04-17 09:26:07 +01:00
Presenters	Fixed #15504 - allow nulling/not changing locale in user bulk edit	2024-09-16 14:31:10 +01:00
Providers	Fixed behavior for null model numbers	2024-08-17 00:27:44 +01:00
Rules	Fixed check for outside assets on user update validation	2024-09-17 15:46:45 +01:00
Services	Re-add space	2024-08-13 15:49:51 +01:00
View	revert changes to label view	2024-09-04 12:38:35 -07:00