snipe 729795364b Merge branch 'develop' of https://github.com/aalaily/snipe-it into aalaily-develop ...

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

2015-08-14 21:36:09 -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

Fixes #1054

2015-08-13 13:24:38 -07: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

Save modelno in API

2015-08-12 20:58:44 -07:00

ReportsController.php

Modified files for accessory report.

2015-08-11 16:35:18 -07:00

SettingsController.php

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

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

StatuslabelsController.php

Added ability to select status type

2015-08-12 22:33:56 -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 branch 'develop' of https://github.com/aalaily/snipe-it into aalaily-develop

2015-08-14 21:36:09 -07:00