snipe 87cd77b4df Merge remote-tracking branch 'origin/2.0' into bootstrap-table-experiment ...

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

2015-07-27 23:41:22 -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

Merge remote-tracking branch 'origin/2.0' into bootstrap-table-experiment

2015-07-27 23:41:22 -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

Fix for sad action column with button wrapping

2015-07-27 15:28:41 -07:00

LocationsController.php

Abililty to inline-add things when you are creating a new asset

2015-07-27 23:27:45 -07:00

ManufacturersController.php

Fixes #387 - sortable asset view by manufacturer

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

ModelsController.php

Abililty to inline-add things when you are creating a new asset

2015-07-27 23:27:45 -07:00

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

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 pull request #969 from snipe/inline_adding

2015-07-27 23:39:07 -07:00