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

..

Accessories

added options to checkout accessoires to locations and assets

2024-07-29 10:54:53 +02:00

Account

one more spot

2024-07-31 12:16:41 -07:00

Api

Fixed #15504 - allow nulling/not changing locale in user bulk edit

2024-09-16 14:31:10 +01:00

Assets

Fixed tests again

2024-09-11 17:29:22 +01:00

Auth

Prevent passing an array as login

2024-08-18 04:51:36 +01:00

Components

Check for FMCS when checking out component

2024-08-06 12:27:15 -07:00

Consumables

Added redirect to checkin/checkout controllers

2024-07-26 12:48:07 +01:00

Kits

Corrected some translations

2024-08-16 12:39:59 +01:00

Licenses

Added more tests

2024-07-26 14:58:10 +01:00

Users

Fixed #15504 - allow nulling/not changing locale in user bulk edit

2024-09-16 14:31:10 +01:00

ActionlogController.php

…

AssetMaintenancesController.php

…

AssetModelsController.php

Set image to null if model is deleted

2024-08-28 14:23:49 +01:00

AssetModelsFilesController.php

…

BulkAssetModelsController.php

…

CategoriesController.php

…

CheckInOutRequest.php

Default to user

2024-08-07 18:04:39 +01:00

CompaniesController.php

…

Controller.php

…

CustomFieldsController.php

…

CustomFieldsetsController.php

Missing string

2024-07-16 21:14:41 +01:00

DashboardController.php

Reflash session so login message is displayed

2024-09-09 14:54:19 -07:00

DepartmentsController.php

…

DepreciationsController.php

Added counts to show method

2024-08-28 12:39:52 +01:00

GoogleAuthController.php

…

GroupsController.php

…

HealthController.php

…

LabelsController.php

…

LocationsController.php

Added location restore

2024-08-19 13:19:59 +01:00

ManufacturersController.php

…

ModalController.php

…

ProfileController.php

Added confetti option

2024-08-15 11:32:42 +01:00

ReportsController.php

Merge branch 'develop' into saving_custom_report_template

2024-09-17 15:26:35 -07:00

ReportTemplatesController.php

…

SettingsController.php

Merge pull request #15296 from uberbrady/expose_restore_sanitize

2024-08-22 12:43:07 +01:00

StatuslabelsController.php

…

SuppliersController.php

…

ViewAssetsController.php

…