Abdullah Alansari d8df61bd32 Merge remote-tracking branch 'upstream/develop' into multiple-companies ...

Conflicts:
	app/controllers/admin/UsersController.php
	app/views/backend/hardware/index.blade.php

2015-11-12 09:30:11 +03:00

..

AccessoriesController.php

Merge remote-tracking branch 'upstream/develop' into multiple-companies

2015-11-12 09:30:11 +03:00

AssetMaintenancesController.php

Fixes #1335 - editing maintenance

2015-11-10 18:02:06 -08:00

AssetsController.php

Merge remote-tracking branch 'upstream/develop' into multiple-companies

2015-11-12 09:30:11 +03:00

CategoriesController.php

Fixes #1324 - missing $inout variable when if/else not met

2015-11-11 17:22:28 -08:00

CompaniesController.php

Add initial support for multiple companies

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

ConsumablesController.php

Add initial support for multiple companies

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

DashboardController.php

Eager load dashboard queries

2015-06-23 11:52:18 -07:00

DepreciationsController.php

Corrected delete modal string for #1266

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

GroupsController.php

Prevent group altering from trolling douchebags

2015-09-15 02:46:40 -07:00

LicensesController.php

Add initial support for multiple companies

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

LocationsController.php

Sorting for #1266

2015-11-02 19:17:20 -08:00

ManufacturersController.php

Fixes #1012 - more consistency in manufacturer view

2015-11-04 00:48:53 -08:00

ModelsController.php

Removed models override

2015-11-04 01:08:17 -08:00

ReportsController.php

Fixes Purchase Cost not showing up on custom reports

2015-10-21 20:24:07 -05:00

SettingsController.php

Added option to select brand type text or logo or text + logo

2015-10-12 20:34:12 +02:00

StatuslabelsController.php

Fixes #1305

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

SuppliersController.php

Corrected delete modal string for #1266

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

UsersController.php

Merge remote-tracking branch 'upstream/develop' into multiple-companies

2015-11-12 09:30:11 +03:00