snipe b9bab05ac3 Merge branch 'master' of https://github.com/ajsy/snipe-it into ajsy-master ...

Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	resources/views/users/print.blade.php

2021-04-05 20:55:49 -07:00

..

Accessories

Added last_checkout and notes from pivot for accessories

2020-10-23 00:44:26 -07:00

Account

Fixed #8558 - error on asset acceptance when no sig is required

2020-10-23 05:09:03 -07:00

Api

Brings PR #6744 up to parity with previous changes - Set custom field's default value when creating a new asset using the API

2021-04-05 20:16:06 -07:00

Assets

Increases DPI of barcode for small lables (#9344)

2021-04-05 19:33:10 -07:00

Auth

Set SAML errors to warning instead of error

2021-03-17 22:30:26 -07:00

Components

Fixed #8737 - incorrect validation string for components update

2020-11-13 12:09:48 -08:00

Consumables

Use $request->input over Request::get()

2019-12-11 11:09:54 -08:00

Kits

Feedback for Kits; Fix checkins for accessories (#7060)

2019-05-23 19:39:30 -07:00

Licenses

Add new StorageHelper and use it where it makes sense (#9276)

2021-03-15 12:26:39 -07:00

Users

Add new StorageHelper and use it where it makes sense (#9276)

2021-03-15 12:26:39 -07:00

ActionlogController.php

…

AssetMaintenancesController.php

Fixed #8544 - escaping on maintenance notes

2020-11-12 23:55:16 -08:00

AssetModelsController.php

Use updated request signature for models

2020-08-26 11:59:30 -07:00

BulkAssetModelsController.php

Use $request->input over Request::get()

2019-12-11 11:09:54 -08:00

CategoriesController.php

Fixed Companies and Categories uploads

2020-08-24 15:43:11 -07:00

CheckInOutRequest.php

…

CompaniesController.php

Fixed Companies and Categories uploads

2020-08-24 15:43:11 -07:00

Controller.php

…

CustomFieldsController.php

…

CustomFieldsetsController.php

Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets

2020-04-24 00:47:19 -07:00

DashboardController.php

…

DepartmentsController.php

Fixed Depts uploads

2020-08-24 15:10:26 -07:00

DepreciationsController.php

…

GroupsController.php

Fixed groups request

2019-12-11 11:26:58 -08:00

HealthController.php

Added #8931: add health controller without session (#8978)

2021-01-26 12:10:54 -08:00

ImportsController.php

…

LocationsController.php

Merge branch 'master' of https://github.com/ajsy/snipe-it into ajsy-master

2021-04-05 20:55:49 -07:00

ManufacturersController.php

Fixes #8918 The validation rules on Manufacturer Model 'name' attribute are malformed. (#9133)

2021-02-16 12:52:55 -08:00

ModalController.php

Refactor controller to use one method that shows all modals based on name.

2020-05-23 15:24:00 -04:00

ProfileController.php

Add a way for a user to override the site skin setting + fix mislabeled comment. (#6891)

2021-03-29 19:09:23 -07:00

ReportsController.php

Add 'Last Audit Date/Next Audit Date' filter to custom report (#8989)

2021-01-26 12:05:31 -08:00

SettingsController.php

Fixed #7211, #9197, #7864, [ch15504] - Added additional LDAP fields to sync (#9318)

2021-04-05 19:26:04 -07:00

StatuslabelsController.php

Fixed status label create error

2020-04-22 03:50:43 -07:00

SuppliersController.php

Fixed the other upload handleUploads signatures

2020-08-24 18:32:40 -07:00

ViewAssetsController.php

Fixed v5 500 server error when requesting multiple [ch15345]

2020-11-02 16:08:38 -08:00