snipe 56582614b6 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop

2020-01-22 16:07:46 -08:00

..

AccessoriesController.php

Merge branch 'develop' into v5-master-develop-integration

2019-11-18 19:49:39 -08:00

AssetMaintenancesController.php

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

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

AssetModelsController.php

Add requestable to asset model api results (#7577)

2019-12-06 10:33:06 -08:00

AssetsController.php

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

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

CategoriesController.php

Merge branch 'develop' into v5-master-develop-integration

2019-11-18 19:49:39 -08:00

CompaniesController.php

Merge branch 'develop' into v5-master-develop-integration

2019-11-18 19:49:39 -08:00

ComponentsController.php

Merge branch 'develop' into v5-master-develop-integration

2019-11-18 19:49:39 -08:00

ConsumablesController.php

Merge branch 'develop' into v5-master-develop-integration

2019-11-18 19:49:39 -08:00

CustomFieldsController.php

Fixed #7250 - permission issue for API fieldsets and fields endpoints

2019-07-24 11:00:42 -07:00

CustomFieldsetsController.php

Fixed #7250 - permission issue for API fieldsets and fields endpoints

2019-07-24 11:00:42 -07:00

DepartmentsController.php

Merge branch 'develop' into v5-master-develop-integration

2019-11-18 19:49:39 -08:00

DepreciationsController.php

Merge branch 'develop' into v5-master-develop-integration

2019-11-18 19:49:39 -08:00

GroupsController.php

Merge branch 'develop' into v5-master-develop-integration

2019-11-18 19:49:39 -08:00

ImportController.php

Select Import File fails in Develop [ch10598] (#7718)

2020-01-17 16:12:51 -08:00

LicensesController.php

Merge branch 'develop' into v5-master-develop-integration

2019-11-18 19:49:39 -08:00

LocationsController.php

Bumped Carbon version

2019-11-21 13:14:18 -08:00

ManufacturersController.php

Merge branch 'develop' into v5-master-develop-integration

2019-11-18 19:49:39 -08:00

PredefinedKitsController.php

Minor code cleanup bits and bobs (#6805)

2019-03-13 20:12:03 -07:00

ProfileController.php

Minor code cleanup bits and bobs (#6805)

2019-03-13 20:12:03 -07:00

ReportsController.php

Change ->has() to ->filled()

2019-05-23 17:39:50 -07:00

SettingsController.php

Fixed parse error in settings controller

2019-12-04 14:54:36 -08:00

StatuslabelsController.php

Merge branch 'develop' into v5-master-develop-integration

2019-11-18 19:49:39 -08:00

SuppliersController.php

Merge branch 'develop' into v5-master-develop-integration

2019-11-18 19:49:39 -08:00

UsersController.php

Removed extra space

2019-12-19 17:47:50 -08:00