snipe 0b5bb520a7 Merge branch 'develop' ...

# Conflicts:
#	config/version.php

2018-05-16 19:24:31 -07:00

..

Api

De-normalize new counters from 4.3.0 (#5547)

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

Auth

Authentication via REMOTE_USER (clean repull) (#5204)

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

AccessoriesController.php

Check for valid accessory category

2018-04-23 16:04:01 -07:00

ActionlogController.php

…

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

Feature/custom fields default values (#5389)

2018-04-23 21:16:55 -07:00

AssetsController.php

Improved files display

2018-05-02 14:13:06 -07:00

CategoriesController.php

Fixed misc UI permissions elements

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

CompaniesController.php

Fixed handling deleting old images better

2017-11-07 11:28:13 -08:00

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

Fixed #5472 - show_in_email for custom fields missing in edit field UI

2018-05-03 08:06:28 -07:00

CustomFieldsetsController.php

…

DashboardController.php

Call migrate before passport install

2017-10-11 12:42:31 -07:00

DepartmentsController.php

Use ImageUploadRequest

2017-12-06 14:38:01 -08:00

DepreciationsController.php

Depreciation view

2017-10-17 11:20:05 -07:00

GroupsController.php

Prepopulate ther groups array on create

2017-12-05 18:17:11 -08:00

ImportsController.php

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

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

LicensesController.php

Added license categories

2018-05-04 21:01:38 -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

Use ImageUploadRequest $request on user profile update

2017-12-06 14:42:14 -08:00

ReportsController.php

Fixed #5500 - present() on correct location value

2018-05-08 09:21:43 -07:00

SettingsController.php

Fixed #5477 - added GDPR privacy policy link in email and webpage

2018-05-08 00:50:13 -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

Fixed php7.2 count issue

2018-05-04 21:00:58 -07:00

ViewAssetsController.php

De-normalize new counters from 4.3.0 (#5547)

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