Godfrey M ee31bfbcd4 Merge branch 'develop' into checkin_non_reassignable_license ...

# Conflicts:
#	app/Helpers/Helper.php
#	app/Http/Controllers/Api/LicenseSeatsController.php
#	app/Http/Transformers/LicensesTransformer.php

2025-04-21 10:49:35 -07:00

..

Accessories

Merge pull request #16435 from marcusmoore/fixes/prevent-deleting-accessories-with-checkouts

2025-04-19 14:38:14 +01:00

Account

Use new logo

2025-04-02 12:10:14 +01:00

Api

Merge branch 'develop' into checkin_non_reassignable_license

2025-04-21 10:49:35 -07:00

Assets

Merge pull request #16667 from Godmartinz/user-redirect-checkin-option

2025-04-16 20:54:47 +01:00

Auth

Update remaining comments from snipe/snipe-it to grokability/snipe-it

2025-04-03 12:07:05 -07:00

Components

Added tighter constraints on deleting components

2025-02-23 14:11:39 +00:00

Consumables

Sure, whatever I guess.

2025-02-19 04:18:40 +00:00

Kits

Added breadcrumbs on kits (sort of)

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

Licenses

Merge branch 'develop' into checkin_non_reassignable_license

2025-04-21 10:49:35 -07:00

Users

Merge pull request #16688 from 36864/patch-1

2025-04-19 14:36:26 +01:00

ActionlogController.php

Fixes #16000 - add S3 support for eula PDF downloads

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

AssetMaintenancesController.php

Fix eol rate in AssetMaintenancesController

2025-03-12 15:38:54 -07:00

AssetModelsController.php

Added withTrashed() to handle soft deletes with RMB

2025-02-24 13:38:06 +00:00

AssetModelsFilesController.php

Added withTrashed() to handle soft deletes with RMB

2025-02-24 13:38:06 +00:00

BulkAssetModelsController.php

Add min_qty to asset model bulk edit

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

CategoriesController.php

More tweaks to the controllers, more breadcrumbs

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

CheckInOutRequest.php

…

CompaniesController.php

Fixed route parameters and tests to match

2025-02-19 05:03:56 +00:00

Controller.php

…

CustomFieldsController.php

Add display_audit to custom fields controller

2025-04-08 02:00:51 +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

…

LabelsController.php

add psuedo example location_id for preview

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

LocationsController.php

Added gates around printing location assets

2025-04-09 06:06:44 +01:00

LocationsFilesController.php

Fixed filename

2025-04-21 16:44:47 +01:00

ManufacturersController.php

Added item back into edit

2025-02-19 04:18:57 +00: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

Merge pull request #16701 from grokability/repo-move

2025-04-15 19:54:08 +01:00

ReportsController.php

Fixed admin string

2025-04-08 05:08:08 +01:00

ReportTemplatesController.php

…

SettingsController.php

Small tweaks to table

2025-04-08 15:30:07 +01:00

StatuslabelsController.php

More test fixes

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

SuppliersController.php

More tweaks to the controllers, more breadcrumbs

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

ViewAssetsController.php

…