snipe 469efc923b Merge branch 'develop' ...

# Conflicts:
#	README.md
#	config/version.php

2018-03-22 20:08:55 -07:00

..

Api

Change duplicate header check to return 1-based header indices

2018-03-22 19:40:12 -07:00

Auth

Authentication via REMOTE_USER (clean repull) (#5204)

2018-03-14 12:48:07 -07:00

AccessoriesController.php

…

ActionlogController.php

…

AssetMaintenancesController.php

…

AssetModelsController.php

Fixed asset model permission not granted for edit

2018-03-07 18:22:49 -08:00

AssetsController.php

…

CategoriesController.php

…

CompaniesController.php

…

ComponentsController.php

…

ConsumablesController.php

…

Controller.php

…

CustomFieldsController.php

…

CustomFieldsetsController.php

…

DashboardController.php

…

DepartmentsController.php

…

DepreciationsController.php

…

GroupsController.php

…

ImportsController.php

Fixed #5217 - permissions error with importer for non-admins

2018-03-22 14:17:44 -07:00

LicensesController.php

…

LocationsController.php

…

ManufacturersController.php

Fixed manufacturer restore

2018-03-03 19:14:27 -08:00

ModalController.php

…

ProfileController.php

…

ReportsController.php

…

SettingsController.php

Authentication via REMOTE_USER (clean repull) (#5204)

2018-03-21 19:09:37 -07:00

StatuslabelsController.php

Fixed #5138 - added default_label flag to status labels

2018-03-05 22:04:16 -08:00

SuppliersController.php

…

UsersController.php

New First Admin Notification (#5147)

2018-03-03 14:37:42 -08:00

ViewAssetsController.php

…