snipe 2f4e54c8a6 Merge remote-tracking branch 'origin/develop'

2015-12-30 15:47:00 -08:00

..

AccessoriesController.php

Fixes #1541

2015-12-29 19:41:50 -08:00

AssetMaintenancesController.php

Fix Two issues with Asset Maintenance.

2015-12-23 20:02:20 -05:00

AssetsController.php

Merge remote-tracking branch 'origin/develop'

2015-12-30 15:47:00 -08:00

CategoriesController.php

Fix consumable count in categories. This adds new methods to Category, consumables consumablesCount and a generic count. It also refactors CatgoriesController to use the count method rather than having it determine the category type.

2015-12-23 20:02:09 -05:00

CompaniesController.php

Add initial support for multiple companies

2015-11-07 15:22:10 +03:00

ConsumablesController.php

Specify table name in select to prevent id overwriting

2015-11-25 02:38:13 -08:00

CustomFieldsController.php

Starter UI improvements and localization for #1397

2015-12-01 17:26:20 -08:00

DashboardController.php

Use global scope for companyable children

2015-11-19 08:42:17 +03:00

DepreciationsController.php

Corrected delete modal string for #1266

2015-10-21 19:46:50 -07:00

GroupsController.php

Fixes #1380 - groups pagination

2015-11-23 19:18:00 -08:00

LicensesController.php

Fix PHPDocs that contained incorrect params tags.

2015-12-24 11:20:05 +00:00

LocationsController.php

TidyUp: Surpress errors on unreachable statements with link to discussion on github.

2015-12-04 08:09:01 +00:00

ManufacturersController.php

Fixes #1413 - wrong link for manufacturers delete

2015-11-29 16:45:55 -08:00

ModelsController.php

Merge remote-tracking branch 'origin/develop'

2015-12-30 15:47:00 -08:00

ReportsController.php

Better handling for invalid locations

2015-12-22 02:40:31 -08:00

SettingsController.php

Merge remote-tracking branch 'origin/develop'

2015-12-30 15:47:00 -08:00

StatuslabelsController.php

Fixes #1305

2015-11-02 16:44:17 -08:00

SuppliersController.php

Fixes #1406 - Fixes link to suppliers delete

2015-11-29 16:55:30 -08:00

UsersController.php

Merge remote-tracking branch 'origin/develop'

2015-12-30 15:47:00 -08:00