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

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

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

..

Accessory.php

Accessories bootstrap tables for #1266

2015-10-21 13:05:14 -07:00

Actionlog.php

Fixes #1174 - broken migration if asset_logs table has uploads

2015-09-14 21:40:05 -07:00

Asset.php

Fixes #1007 and #1053

2015-10-22 02:11:39 -07:00

AssetMaintenance.php

Asset maintenances for #1266

2015-10-21 22:19:02 -07: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

Consumable.php

Merge branch 'bootstrap-table-experiment' into develop-bootstrap-tables-integration

2015-10-20 17:52:02 -07: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

License.php

Additional fields for text search on licenses

2015-10-21 13:14:56 -07:00

LicenseSeat.php

Added new 4.2 SoftDeletingTrait

2015-02-04 15:50:40 -08:00

Location.php

Fixed relationshop again?

2015-10-21 16:14:15 -07: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

Fix for showing deleted items

2015-10-21 18:05:27 -07:00