Brady Wetherington d653126a2a Merge branch 'develop' into custom_fields ...

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

2015-11-25 14:22:22 -08:00

..

AccessoriesController.php

Specify table name in select to prevent id overwriting

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

AssetMaintenancesController.php

Fix some typos (e.g: companayable)

2015-11-19 08:48:43 +03:00

AssetsController.php

Merge branch 'develop' into custom_fields

2015-11-25 14:22:22 -08:00

CategoriesController.php

Show company name for the remaining entities

2015-11-18 19:15:56 +03: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

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

Added company_list to license clone

2015-11-25 03:48:05 -08:00

LocationsController.php

Sorting for #1266

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

ManufacturersController.php

Show company name for the remaining entities

2015-11-18 19:15:56 +03:00

ModelsController.php

Merge branch 'develop' into custom_fields

2015-11-25 14:22:22 -08:00

ReportsController.php

Use global scope for companyable children

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

SettingsController.php

Merge pull request #1321 from Ahimta/multiple-companies

2015-11-23 14:40:37 -08: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

Fixed dumb indenting

2015-11-24 20:20:34 -08:00