snipe bcd988bb81 Merge branch 'develop' of https://github.com/DeusMaximus/snipe-it into develop ...

# Conflicts:
#	app/Http/Controllers/Auth/LoginController.php

2018-07-17 01:11:15 -07:00

..

Api

Fixed #5842 - added components to location detail view

2018-07-16 21:50:14 -07:00

Auth

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

2018-07-17 01:11:15 -07:00

AccessoriesController.php

Assetcontroller cleanup (#5858)

2018-07-16 17:44:03 -07:00

ActionlogController.php

…

AssetCheckinController.php

Assetcontroller cleanup (#5858)

2018-07-16 17:44:03 -07:00

AssetCheckoutController.php

Assetcontroller cleanup (#5858)

2018-07-16 17:44:03 -07:00

AssetFilesController.php

Fixes #5859 - add file name/size to file upload UI (#5861)

2018-07-16 20:09:53 -07:00

AssetMaintenancesController.php

Create asset maintenance - Added orange bar for required asset to edit view (#5520)

2018-05-16 19:23:23 -07:00

AssetModelsController.php

Assetcontroller cleanup (#5858)

2018-07-16 17:44:03 -07:00

AssetsController.php

Fixes #5859 - add file name/size to file upload UI (#5861)

2018-07-16 20:09:53 -07:00

BulkAssetsController.php

Assetcontroller cleanup (#5858)

2018-07-16 17:44:03 -07:00

CategoriesController.php

…

CheckInOutRequest.php

Assetcontroller cleanup (#5858)

2018-07-16 17:44:03 -07:00

CompaniesController.php

Fixing authorization issues (#5807)

2018-07-12 18:28:02 -07:00

ComponentsController.php

Removes the unused bulk operations for components (#5840)

2018-07-16 14:11:38 -07:00

ConsumablesController.php

…

Controller.php

…

CustomFieldsController.php

Removes setting the encryption status on update (#5833)

2018-07-13 04:04:30 -07:00

CustomFieldsetsController.php

Adds permission checks for custom fields and custom fieldsets (#5645) (#5795)

2018-07-12 18:28:20 -07:00

DashboardController.php

…

DepartmentsController.php

Fixing authorization issues (#5807)

2018-07-12 18:28:02 -07:00

DepreciationsController.php

Fixing authorization issues (#5807)

2018-07-12 18:28:02 -07:00

GroupsController.php

…

ImportsController.php

…

LicensesController.php

Fixes #5859 - add file name/size to file upload UI (#5861)

2018-07-16 20:09:53 -07:00

LocationsController.php

Assetcontroller cleanup (#5858)

2018-07-16 17:44:03 -07:00

ManufacturersController.php

…

ModalController.php

Remove old helpers (#5843)

2018-07-16 14:22:25 -07:00

ProfileController.php

…

ReportsController.php

Fixing authorization issues (#5807)

2018-07-12 18:28:02 -07:00

SettingsController.php

Added option to include model information on asset labels. (#5301)

2018-07-12 18:23:12 -07:00

StatuslabelsController.php

Assetcontroller cleanup (#5858)

2018-07-16 17:44:03 -07:00

SuppliersController.php

Assetcontroller cleanup (#5858)

2018-07-16 17:44:03 -07:00

UsersController.php

Fix activated check for login

2018-07-16 23:48:46 -07:00

ViewAssetsController.php

De-normalize new counters from 4.3.0 (#5547)

2018-05-16 19:20:43 -07:00