snipe 7d5810b656 Merge remote-tracking branch 'origin/develop' into 2.0 ...

# Conflicts:
#	app/config/version.php
#	app/controllers/admin/AssetsController.php

2015-07-02 17:23:06 -07:00

..

AccessoriesController.php

Consumables section

2015-06-09 19:50:34 -07:00

AssetsController.php

Merge remote-tracking branch 'origin/develop' into 2.0

2015-07-02 17:23:06 -07:00

CategoriesController.php

Update Category Types Array to include Consumable

2015-07-01 17:28:58 +09:30

ConsumablesController.php

Removed checkin for consumables

2015-06-22 17:57:44 -07:00

DashboardController.php

Eager load dashboard queries

2015-06-23 11:52:18 -07:00

DepreciationsController.php

Change paginate to get for Index

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

GroupsController.php

Disallow group edit for demo

2015-06-30 22:04:48 -07: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

Add manufacturer to models listing for clarity

2015-06-30 19:15:43 -07:00

ReportsController.php

Fixes #750 because @uberbrady can't code

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

SettingsController.php

Merge remote-tracking branch 'origin/develop' into 2.0

2015-06-30 22:42:00 -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

Allow saving of Username and Email changes

2015-07-02 12:16:01 +09:30