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

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

2015-07-24 15:56:10 -07:00

..

AccessoriesController.php

Add email to postCheckin

2015-07-24 10:22:54 +09:30

AssetMaintenancesController.php

Fixed all issues that were reported by @leobg

2015-07-20 21:34:19 -04:00

AssetsController.php

Add email to postCheckin

2015-07-24 10:24:14 +09:30

CategoriesController.php

Add Checkin_email to Create and Edit

2015-07-24 10:21:51 +09:30

ConsumablesController.php

Add extra fields for email

2015-07-24 09:28:17 +09:30

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

Merge pull request #933 from madd15/patch-4

2015-07-23 16:16:02 -07:00

LocationsController.php

Migration for location-specific currency, updated views for #819

2015-07-08 20:35:40 -07:00

ManufacturersController.php

Fixes #387 - sortable asset view by manufacturer

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

ModelsController.php

Fix edit model cat list showing deleted categories

2015-07-24 08:44:53 +09:30

ReportsController.php

Added Carbon to the uses statement for reports controller

2015-07-20 21:42:07 -04:00

SettingsController.php

Migration for location-specific currency, updated views for #819

2015-07-08 20:35:40 -07:00

StatuslabelsController.php

Fixes #502 - normalized statuses

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

SuppliersController.php

Fixed all issues that were reported by @leobg

2015-07-20 21:34:19 -04:00

UsersController.php

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

2015-07-24 15:56:10 -07:00