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

# Conflicts:
#	app/controllers/admin/UsersController.php
#	app/models/Model.php
#	app/views/backend/hardware/edit.blade.php
#	app/views/backend/users/index.blade.php
#	composer.lock

2015-08-11 13:20:25 -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

First rough pass at asset acceptance report

2015-08-07 18:50:55 -04:00

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

Fixes #902 - redirect to group listing page after group create

2015-07-24 17:43:33 -07:00

LicensesController.php

Fixes #1010 - better errors on large file uploads

2015-08-04 12:45:17 -07:00

LocationsController.php

Fixes #970

2015-07-28 20:24:58 -07:00

ManufacturersController.php

Fixes #387 - sortable asset view by manufacturer

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

ModelsController.php

Fixes #948 - validate on model name+modelno+manufacturer combination

2015-08-06 05:58:50 -07:00

ReportsController.php

Fixed issue with Asset model

2015-08-07 18:52:19 -04:00

SettingsController.php

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

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

StatuslabelsController.php

First pass at this, the ugly way. Just to see wha it looks like.

2015-07-26 18:15:06 -07:00

SuppliersController.php

First pass at this, the ugly way. Just to see wha it looks like.

2015-07-26 18:15:06 -07:00

UsersController.php

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

2015-08-11 13:20:25 -07:00