Marcus Moore 4298aad008 Merge branch 'develop' into 17369-accessory-checkout-qty-scaffold ...

# Conflicts:
#	app/Http/Controllers/Account/AcceptanceController.php
#	resources/views/notifications/markdown/asset-acceptance.blade.php

2025-08-26 11:39:52 -07:00

..

Accessories

Merge pull request #17539 from grokability/add-file-uploads-to-maintenances

2025-08-10 11:13:19 +01:00

Account

Merge branch 'develop' into 17369-accessory-checkout-qty-scaffold

2025-08-26 11:39:52 -07:00

Api

Revert "Merge pull request #17650 from grokability/add-displayName-to-users"

2025-08-21 20:23:47 +01:00

Assets

Fixed hardware.bulkedit redirect

2025-08-18 09:45:02 +01:00

Auth

Remove 2fa_authed from session upon logout

2025-05-07 14:04:33 -07:00

Components

Merge pull request #17539 from grokability/add-file-uploads-to-maintenances

2025-08-10 11:13:19 +01:00

Consumables

Merge pull request #17539 from grokability/add-file-uploads-to-maintenances

2025-08-10 11:13:19 +01:00

Kits

Added breadcrumbs on kits (sort of)

2025-02-19 14:05:29 +00:00

Licenses

Merge pull request #17539 from grokability/add-file-uploads-to-maintenances

2025-08-10 11:13:19 +01:00

Users

Revert "Merge pull request #17650 from grokability/add-displayName-to-users"

2025-08-21 20:23:47 +01:00

ActionlogController.php

Fixes #16000 - add S3 support for eula PDF downloads

2025-01-17 17:49:19 +00:00

AssetModelsController.php

Added option to clone original images

2025-08-04 18:47:26 +01:00

BulkAssetModelsController.php

Add min_qty to asset model bulk edit

2025-03-12 18:27:27 +00:00

CategoriesController.php

Wire up category controller

2025-06-12 12:32:34 -07:00

CheckInOutRequest.php

…

CompaniesController.php

Removed logging

2025-07-07 12:31:12 +01:00

Controller.php

Use newer file path

2025-08-10 18:26:41 +01:00

CustomFieldsController.php

Use translations and more standard error bag

2025-08-17 13:30:43 +01:00

CustomFieldsetsController.php

RMB for custom fields

2025-02-20 14:57:18 +00:00

DashboardController.php

Follow up for #16341

2025-02-26 20:15:09 +00:00

DepartmentsController.php

Route model binding for resource groups

2025-02-19 02:49:05 +00:00

DepreciationsController.php

More tweaks to the controllers, more breadcrumbs

2025-02-19 03:29:31 +00:00

GoogleAuthController.php

…

GroupsController.php

Set empty array if group permission is a string or null

2025-04-08 07:06:56 +01:00

HealthController.php

Squashed commit of the following:

2024-11-12 15:39:22 +00:00

LabelsController.php

add psuedo example location_id for preview

2025-04-07 12:53:17 -07:00

LocationsController.php

Added option to clone original images

2025-08-04 18:47:26 +01:00

MaintenancesController.php

Renamed more files

2025-08-10 13:24:14 +01:00

ManufacturersController.php

Fix Manufacturer Seeder button

2025-07-30 09:04:04 -06:00

ModalController.php

Better visual spacing

2025-03-12 17:28:05 +00:00

NotesController.php

Increased text limit on notes

2025-02-22 12:56:25 +00:00

ProfileController.php

Added stored eula method on profile

2025-06-22 19:24:45 +01:00

ReportsController.php

Renamed routes and method names

2025-08-10 13:29:48 +01:00

ReportTemplatesController.php

Inline fields when updating

2024-11-07 11:03:03 -08:00

SettingsController.php

Revert "Merge pull request #17650 from grokability/add-displayName-to-users"

2025-08-21 20:23:47 +01:00

StatuslabelsController.php

More test fixes

2025-02-19 06:19:50 +00:00

SuppliersController.php

Few more replcamenents

2025-08-10 14:14:21 +01:00

UploadedFilesController.php

Rename models uploads dir

2025-08-10 17:58:11 +01:00

ViewAssetsController.php

List users code refactoring

2025-06-05 20:05:38 +02:00