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

..

Accessory.php

Fixes #1332 - added location to accessories

2015-11-24 22:43:13 -08:00

Actionlog.php

Use global scope for companyable children

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

Asset.php

Merge branch 'develop' into custom_fields

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

AssetMaintenance.php

Use global scope for companyable children

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

Authentication.php

TidyUp: Remove excess whitespace.

2014-12-24 22:34:16 +00:00

Category.php

Add scopeTextSearch

2015-10-21 14:31:26 +10:30

Company.php

Only users with no company or supers can manage users' companies

2015-11-21 04:30:15 +03:00

CompanyableChildScope.php

Fix some typos (e.g: companayable)

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

CompanyableChildTrait.php

Fix some typos (e.g: companayable)

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

CompanyableScope.php

Fix some typos (e.g: companayable)

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

CompanyableTrait.php

Fix some typos (e.g: companayable)

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

Consumable.php

Closes #1375 - More data in consumables detail view

2015-11-24 21:58:30 -08:00

ConsumableAssignment.php

Closes #1375 - More data in consumables detail view

2015-11-24 21:58:30 -08:00

CustomField.php

Terribly rough Custom Fields creation

2015-10-22 00:38:07 -07:00

CustomFieldset.php

Asset editing works.

2015-10-22 01:06:35 -07:00

Depreciable.php

"Years" turn out to be 12 times longer than months, apparently

2015-04-08 16:36:06 -07:00

Depreciation.php

Depreciations bootstrap tables for #1266

2015-10-21 19:43:09 -07:00

Elegant.php

First stab at custom fields - model side only, to start

2015-07-06 20:09:47 -07:00

Group.php

alpha 0.4.0 release candidate

2014-08-11 17:13:43 +09:00

ICompanyableChild.php

Add global scope for companyable children

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

License.php

Fixed indenting

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

LicenseSeat.php

Use global scope for companyable children

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

Location.php

Sorting for #1266

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

Manufacturer.php

Manufacturers for #1266

2015-10-21 19:09:02 -07:00

Model.php

Merge branch 'develop' into custom_fields

2015-10-22 02:30:30 -07:00

Setting.php

Allow > tags for custom CSS to modify bootstrap

2015-09-14 16:47:16 -07:00

Statuslabel.php

Search text method for #1266

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

Supplier.php

Suppliers for #1266

2015-10-21 19:09:20 -07:00

Throttle.php

Fix eager loading for user throttle

2015-03-17 15:36:11 -07:00

User.php

Fixes #1369 - fixed searching/sorting on location

2015-11-24 12:48:41 -08:00