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

..

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 options to checkout accessoires to locations and assets

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

AccessoryCheckout.php

added options to checkout accessoires to locations and assets

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

Actionlog.php

Pulled searchable relation on model - needs revisit

2024-08-11 10:26:02 +01:00

Asset.php

gives priority to default eula being checked vs catregory eula

2024-09-03 12:23:23 -07:00

AssetMaintenance.php

Added serial and status to searchable relations

2024-02-14 09:59:10 +00:00

AssetModel.php

Nicer formatting for searchableAttributes

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

Category.php

Removed parens

2024-07-05 00:22:46 +01:00

CheckoutAcceptance.php

new branch cuz test merge

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

CheckoutRequest.php

Add the withTrashed() method to requestingUser() method in CheckoutRequest model, so the view of requestable assets doesn't crash

2023-07-10 16:34:00 -06:00

Company.php

Modernize use statements, switch to auth()

2024-07-04 20:49:22 +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

Remove global scope when counting check outs

2024-08-06 12:16:06 -07:00

Consumable.php

Added ability to sort on qty and remaining for consumables

2024-09-09 03:49:58 +01:00

ConsumableAssignment.php

Require the user exists

2024-07-11 16:18:42 +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

Add CompanyableTrait to Department

2023-08-07 16:54:02 -07:00

Depreciable.php

Merge pull request #15100 from Godmartinz/depreciation_percentage

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

Depreciation.php

Added assets relationship

2024-08-28 12:38:55 +01:00

Group.php

Add unique constraint to name

2024-05-28 15:09:31 +01:00

ICompanyableChild.php

Adopt Laravel coding style

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

Import.php

Adopt Laravel coding style

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

Ldap.php

Use app()->getLocale() to determine imported user’s language

2024-07-13 15:15:44 +01:00

License.php

Added created_by to license view

2024-07-26 10:24:13 +01:00

LicenseSeat.php

removed that clause

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

Location.php

Fixed #15341 - validate parent ID

2024-08-21 09:46:18 +01:00

Loggable.php

Modernize use statements, switch to auth()

2024-07-04 20:49:22 +01:00

Manufacturer.php

Makes all manufacturer URLs dynamic, not just warranty lookup.

2024-03-31 22:18:44 -04:00

PredefinedKit.php

Shift bindings

2021-06-10 20:16:56 +00:00

ReportTemplate.php

Add docblocks

2024-01-18 15:42:52 -08:00

Requestable.php

Refactor Requestable@cancelRequest() firm to admit a user_id so we can cancel a request of whatever user we want

2023-06-27 17:13:11 -06: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

Added a setting test and validation on settings

2024-08-16 10:51:49 +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

Backporting #10829 to master

2022-03-25 13:00:16 +00: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