Godfrey M f29a383179 Merge branch 'develop' into seperating_notification_n_mail ...

# Conflicts:
#	app/Notifications/CheckoutConsumableNotification.php

2024-10-23 15:15:14 -07:00

..

Labels

…

Recipients

handle some edge cases, null values clean up variable names

2024-10-15 14:01:28 -07:00

Traits

…

Accessory.php

Added maxlengths to additional fields

2024-10-01 14:02:54 +01:00

AccessoryCheckout.php

Change user_id to created_by

2024-09-17 22:16:41 +01:00

Actionlog.php

Additional consistencies

2024-09-19 17:20:56 +01:00

Asset.php

Merge pull request #15579 from bryanlopezinc/ImportTests

2024-10-03 11:39:21 -07:00

AssetMaintenance.php

Fixed #15651 - admin user now displaying on maintenances page

2024-10-11 11:16:24 +01:00

AssetModel.php

Eager load adminuser

2024-09-20 14:33:26 +01:00

Category.php

Added scoping for categories and companies

2024-09-19 17:56:05 +01:00

CheckoutAcceptance.php

…

CheckoutRequest.php

Fixed requestable user_id

2024-09-18 14:32:59 +01:00

Company.php

Have getIdForCurrentUser method return null if FMCS enabled, user is not super admin, and does not have company

2024-10-17 15:14:39 -07:00

CompanyableChildScope.php

…

CompanyableChildTrait.php

…

CompanyableScope.php

…

CompanyableTrait.php

Fix outdated comment in CompanyableTrait

2024-10-17 11:07:28 +02:00

Component.php

Added manufacturer and model_number to components

2024-10-23 17:50:22 +01:00

Consumable.php

Added maxlengths to additional fields

2024-10-01 14:02:54 +01:00

ConsumableAssignment.php

Change user_id to created_by

2024-09-17 22:16:41 +01:00

CustomField.php

…

CustomFieldset.php

…

Department.php

Change user_id to created_by

2024-09-17 22:16:41 +01:00

Depreciable.php

…

Depreciation.php

Order by created_by for depreciations

2024-09-19 17:41:05 +01:00

Group.php

Order by created_by for depreciations

2024-09-19 17:41:05 +01:00

ICompanyableChild.php

…

Import.php

Swap factory syntax

2024-10-03 13:59:58 -07:00

Ldap.php

feat: Explicitly request LDAP attributes during sync

2024-09-13 17:05:48 +02:00

License.php

Use auth()->id() instead of Auth::id()

2024-09-19 17:31:46 +01:00

LicenseSeat.php

…

Location.php

Fixed typo

2024-10-15 12:42:09 +01:00

Loggable.php

Merge branch 'develop' into testing/fmcs-accessories

2024-09-30 12:59:27 -07:00

Manufacturer.php

Added manufacturer and model_number to components

2024-10-23 17:50:22 +01:00

PredefinedKit.php

Added created_by to kits

2024-09-19 17:01:17 +01:00

Requestable.php

Use auth()->id() instead of Auth::id()

2024-09-19 17:31:46 +01:00

SamlNonce.php

…

SCIMUser.php

…

Setting.php

Switch to form requests for settings

2024-10-09 18:16:34 +01:00

SnipeModel.php

…

SnipeSCIMConfig.php

…

Statuslabel.php

Added created_by to status label

2024-09-19 18:22:11 +01:00

Supplier.php

…

User.php

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

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