snipe 123caf42c2 Merge remote-tracking branch 'origin/develop' into 1.3.0 ...

# Conflicts:
#	app/views/backend/hardware/labels.blade.php
#	app/views/backend/layouts/default.blade.php

2015-05-27 11:17:14 -07:00

..

AccessoriesController.php

Accessories Slack integration

2015-04-30 20:53:44 -07:00

AssetsController.php

Display default location

2015-05-04 13:08:38 -07:00

CategoriesController.php

Convert Categories View to use Datatables, and fix Model View missing comma

2015-03-25 12:03:49 +10:30

DashboardController.php

Dashboard

2015-02-25 16:30:59 -08:00

DepreciationsController.php

Change paginate to get for Index

2014-10-27 12:14:55 +10:30

GroupsController.php

Updated spacing for PSR-2

2014-06-24 17:49:39 -04:00

LicensesController.php

Add licenses.reassignable migration

2015-05-22 14:11:36 +01:00

LocationsController.php

Eager load assigned asset locations

2015-05-07 18:21:39 -07:00

ManufacturersController.php

Fixes #387 - sortable asset view by manufacturer

2015-02-11 04:57:59 -08:00

ModelsController.php

Moved checkModel into model from controller

2015-03-27 13:45:37 -07:00

ReportsController.php

Fixes #750 because @uberbrady can't code

2015-04-30 17:14:31 -07:00

SettingsController.php

Slack field validation and placeholder text

2015-04-30 16:58:33 -07:00

StatuslabelsController.php

Fixes #502 - normalized statuses

2015-02-10 15:57:19 -08:00

SuppliersController.php

Add image to supplier

2014-11-07 13:46:14 +10:30

UsersController.php

Added accessories and location

2015-05-04 13:31:47 -07:00