snipe d40129bdae Merge remote-tracking branch 'origin/develop' ...

# Conflicts:
#	Dockerfile

2016-05-16 20:55:08 -07:00

..

AccessoriesController.php

Use helper for company selectlist, added missing language strings

2016-02-12 14:08:35 -08:00

AssetMaintenancesController.php

Fix Two issues with Asset Maintenance.

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

AssetsController.php

Use helper for company selectlist, added missing language strings

2016-02-12 14:08:35 -08:00

CategoriesController.php

Fixes #1634 - better handling for category listings that are not asset categories

2016-05-16 20:53:51 -07:00

CompaniesController.php

Add initial support for multiple companies

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

ConsumablesController.php

Use helper for company selectlist, added missing language strings

2016-02-12 14:08:35 -08:00

CustomFieldsController.php

Eager-Load CustomFieldsets and CustomFields with relations

2015-12-30 16:08:40 -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

Use helper for company selectlist, added missing language strings

2016-02-12 14:08:35 -08:00

LocationsController.php

Fix hard to exploit stored XSS possibility: code wrongly expected people to only be able to submit entries from <select>

2016-03-13 14:25:46 +01:00

ManufacturersController.php

Fixes #1413 - wrong link for manufacturers delete

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

ModelsController.php

Fixes #1686 - added notes to model

2016-01-27 20:39:19 -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

Added LDAP pagination for user import.

2016-03-08 19:39:39 +13:00