Marcus Moore 5306e1cd15 Merge branch 'develop' into saving_custom_report_template ...

# Conflicts:
#	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/supplier-select.blade.php
#	resources/views/reports/custom.blade.php

2024-10-15 12:32:01 -07:00

..

Labels

Add a Brother compatible 62mm wide label.

2024-06-28 09:49:53 +02:00

Recipients

Added trim to CC email as well

2022-03-04 06:20:34 -08:00

Traits

Cleaned up facade names and references

2024-05-29 12:38:15 +01:00

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

new branch cuz test merge

2024-07-08 12:55:59 -05:00

CheckoutRequest.php

Fixed requestable user_id

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

Company.php

Refactor isDeletable on companies

2024-09-19 20:38:34 +01:00

CompanyableChildScope.php

Adopt Laravel coding style

2021-06-10 20:15:52 +00:00

CompanyableChildTrait.php

Adopt Laravel coding style

2021-06-10 20:15:52 +00:00

CompanyableScope.php

Adopt Laravel coding style

2021-06-10 20:15:52 +00:00

CompanyableTrait.php

Added comments

2024-04-11 15:15:56 +01:00

Component.php

Added maxlengths to additional fields

2024-10-01 14:02:54 +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

Use fully qualified use statements

2024-07-25 16:08:46 +01:00

CustomFieldset.php

new validator for radio buttons

2024-03-25 21:03:13 -05:00

Department.php

Change user_id to created_by

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

Depreciable.php

Merge pull request #15100 from Godmartinz/depreciation_percentage

2024-08-12 10:10:25 +01:00

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

Adopt Laravel coding style

2021-06-10 20:15:52 +00:00

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

removed that clause

2024-01-04 14:32:03 -08:00

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

Optimize isDeletable counts

2024-09-19 20:13:38 +01:00

PredefinedKit.php

Added created_by to kits

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

ReportTemplate.php

Formatting

2024-09-17 16:58:49 -07:00

Requestable.php

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

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

SamlNonce.php

Enforce SAML assertion ID uniqueness and notValidOnOrAfter attribute

2024-01-25 19:53:24 +00:00

SCIMUser.php

Use $attributes array

2023-09-14 13:52:57 +01:00

Setting.php

Switch to form requests for settings

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

SnipeModel.php

Fix PATCH of purchase_cost for assets for comma as decimal separator

2024-08-29 12:35:14 +01:00

SnipeSCIMConfig.php

Force active flag to be returned as true or false

2023-11-23 16:34:03 +00:00

Statuslabel.php

Added created_by to status label

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

Supplier.php

Make validation match database fields

2023-05-08 14:12:54 -07:00

User.php

Merge branch 'develop' into saving_custom_report_template

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