snipe b29d7beb3a Merge branch 'develop' ...

# Conflicts:
#	.gitignore
#	Dockerfile
#	README.md
#	app/Http/Controllers/AccessoriesController.php
#	app/Http/Controllers/AssetMaintenancesController.php
#	app/Http/Controllers/AssetsController.php
#	app/Http/Controllers/ConsumablesController.php
#	app/Http/Controllers/GroupsController.php
#	app/Http/Controllers/LicensesController.php
#	app/Http/Controllers/ReportsController.php
#	app/Http/Controllers/UsersController.php
#	app/Http/routes.php
#	app/Models/Depreciation.php
#	app/Models/Location.php
#	config/version.php
#	resources/views/account/view-assets.blade.php
#	resources/views/hardware/edit.blade.php
#	resources/views/hardware/view.blade.php
#	resources/views/partials/modals.blade.php
#	resources/views/reports/custom.blade.php
#	snipeit.sh

2017-09-22 16:12:18 -07:00

..

Api

Custom field import repair (#3968)

2017-09-18 12:29:08 -07:00

Auth

Update all controllers to use laravel 5 return view method

2017-06-09 16:44:03 -07:00

AccessoriesController.php

Progress towards better email notifications (#3911)

2017-08-31 11:14:21 -07:00

ActionlogController.php

Discussion: Moving to policies for controller based authorization (#3080)

2016-12-19 11:04:28 -08:00

AssetMaintenancesController.php

Small maintenance fixes

2017-09-08 17:49:01 -07:00

AssetModelsController.php

ADDED: Password rules for complexity, min length, rejecting common passwords

2017-08-22 20:32:39 -07:00

AssetsController.php

Merge branch 'develop'

2017-09-22 16:12:18 -07:00

CategoriesController.php

Update all controllers to use laravel 5 return view method

2017-06-09 16:44:03 -07:00

CompaniesController.php

Update all controllers to use laravel 5 return view method

2017-06-09 16:44:03 -07:00

ComponentsController.php

Progress towards better email notifications (#3911)

2017-08-31 11:14:21 -07:00

ConsumablesController.php

Assorted fixes (#3923)

2017-09-05 17:54:58 -07:00

Controller.php

…

CustomFieldsController.php

Update all controllers to use laravel 5 return view method

2017-06-09 16:44:03 -07:00

CustomFieldsetsController.php

Update all controllers to use laravel 5 return view method

2017-06-09 16:44:03 -07:00

DashboardController.php

Update all controllers to use laravel 5 return view method

2017-06-09 16:44:03 -07:00

DepartmentsController.php

Fixes #3776 - adds Company to Dept UI

2017-07-29 16:42:17 -07:00

DepreciationsController.php

Update all controllers to use laravel 5 return view method

2017-06-09 16:44:03 -07:00

GroupsController.php

No new feature,No bug fix, Only refactoring (#3949)

2017-09-12 12:28:42 -07:00

ImportsController.php

Importer mapping - v1 (#3677)

2017-06-21 16:37:37 -07:00

LicensesController.php

Merge branch 'develop'

2017-09-22 16:12:18 -07:00

LocationsController.php

Fix location view display. Migrate to api controller methods and fix missing bits to make this happen. Show manager on the location view page.

2017-06-12 18:24:20 -05:00

ManufacturersController.php

Update all controllers to use laravel 5 return view method

2017-06-09 16:44:03 -07:00

ModalController.php

Refactor and improve Modal support for Assets (#3884)

2017-08-24 22:24:02 -07:00

ProfileController.php

Enforce password complexity rules on new account password change

2017-08-22 22:41:35 -07:00

ReportsController.php

Merge branch 'develop'

2017-09-22 16:12:18 -07:00

SettingsController.php

Fixes #3907

2017-08-31 13:45:48 -07:00

StatuslabelsController.php

Update all controllers to use laravel 5 return view method

2017-06-09 16:44:03 -07:00

SuppliersController.php

Update all controllers to use laravel 5 return view method

2017-06-09 16:44:03 -07:00

UsersController.php

Merge branch 'develop'

2017-09-22 16:12:18 -07:00

ViewAssetsController.php

Assorted fixes (#3923)

2017-09-05 17:54:58 -07:00