snipe 4c5f20fde4 Merge branch 'develop' ...

# Conflicts:
#	app/Importer/Importer.php
#	config/version.php

2018-04-23 13:33:34 -07:00

..

Api

Allow setting of "ldap_import" through the API (#5218)

2018-04-20 14:02:52 -07:00

Auth

Authentication via REMOTE_USER (clean repull) (#5204)

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

AccessoriesController.php

Notification improvements (#5254)

2018-03-25 13:46:57 -07:00

ActionlogController.php

…

AssetMaintenancesController.php

Features/better table options (#5018)

2018-02-16 13:22:55 -08:00

AssetModelsController.php

Fixed asset model permission not granted for edit

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

AssetsController.php

WIP - Improved requested assets (#5289)

2018-04-04 17:33:02 -07:00

CategoriesController.php

Fixed misc UI permissions elements

2018-01-20 04:39:31 -08:00

CompaniesController.php

…

ComponentsController.php

Fixed incorrect component not found string

2018-02-22 16:36:01 -08:00

ConsumablesController.php

Notification improvements (#5254)

2018-03-25 13:46:57 -07:00

Controller.php

…

CustomFieldsController.php

Notification improvements (#5254)

2018-03-25 13:46:57 -07:00

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

Notification improvements (#5254)

2018-03-25 13:46:57 -07:00

LocationsController.php

Fixed misc UI permissions elements

2018-01-20 04:39:31 -08:00

ManufacturersController.php

Fixed manufacturer restore

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

ModalController.php

Added “new” buttons for manufacturer and category in asset model creation

2017-12-19 20:30:46 -08:00

ProfileController.php

…

ReportsController.php

Added department to custom asset export

2018-04-16 20:10:38 -07:00

SettingsController.php

Notification improvements (#5254)

2018-03-25 13:46:57 -07:00

StatuslabelsController.php

Fixed #5138 - added default_label flag to status labels

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

SuppliersController.php

Fixed misc UI permissions elements

2018-01-20 04:39:31 -08:00

UsersController.php

New First Admin Notification (#5147)

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

ViewAssetsController.php

WIP - Improved requested assets (#5289)

2018-04-04 17:33:02 -07:00