Splaer b2af455523 Merge conflict resolution. Added a use at the same line as remote. Fixed

2015-02-25 14:09:58 -05:00

..

AssetsController.php

Merge conflict resolution. Added a use at the same line as remote. Fixed

2015-02-25 14:09:58 -05:00

CategoriesController.php

Fixes #163 - accept acceptance + eula

2015-02-24 22:15:36 -08:00

DashboardController.php

Updated spacing for PSR-2

2014-06-24 17:49:39 -04:00

DepreciationsController.php

Change paginate to get for Index

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

GroupsController.php

Updated spacing for PSR-2

2014-06-24 17:49:39 -04:00

LicensesController.php

Possible fix for #518 - license count issue

2015-02-12 12:25:22 -08:00

LocationsController.php

Change paginate to get for Index

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

ManufacturersController.php

Fixes #387 - sortable asset view by manufacturer

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

ModelsController.php

Fixes #509 - added MAC address as model option

2015-02-11 16:37:24 -08:00

ReportsController.php

Fixes #374 to keep the requirement to PHP 5.4

2014-11-20 16:38:50 -05:00

SettingsController.php

Fixes #163 - accept acceptance + eula

2015-02-24 22:15:36 -08: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

Fixes #163 - accept acceptance + eula

2015-02-24 22:15:36 -08:00