snipe b492ac4950 Merge branch 'bootstrap-table-experiment' into develop-bootstrap-tables-integration ...

# Conflicts:
#	.gitignore
#	app/controllers/admin/AccessoriesController.php
#	app/controllers/admin/AssetsController.php
#	app/controllers/admin/LicensesController.php
#	app/models/Accessory.php
#	app/models/Asset.php
#	app/routes.php
#	app/views/backend/accessories/index.blade.php
#	app/views/backend/accessories/view.blade.php
#	app/views/backend/hardware/index.blade.php
#	app/views/backend/licenses/index.blade.php

2015-10-20 17:52:02 -07:00

..

Accessory.php

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

2015-10-20 17:52:02 -07:00

Actionlog.php

Fixes #1174 - broken migration if asset_logs table has uploads

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

Asset.php

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

2015-10-20 17:52:02 -07:00

AssetMaintenance.php

Fixed all issues that were reported by @leobg

2015-07-20 21:34:19 -04:00

Authentication.php

TidyUp: Remove excess whitespace.

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

Category.php

Fixed wrong model type reference

2015-09-23 09:58:09 -07:00

Consumable.php

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

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

First stab at cleaning up Depreciation

2015-02-17 17:39:39 -08:00

Elegant.php

First stab at cleaning up Depreciation

2015-02-17 17:39:39 -08:00

Group.php

alpha 0.4.0 release candidate

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

License.php

Add name text search

2015-08-25 16:37:10 +09:30

LicenseSeat.php

Added new 4.2 SoftDeletingTrait

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

Location.php

Disllow delete if parent

2015-07-28 20:45:32 -07:00

Manufacturer.php

Fixes #387 - sortable asset view by manufacturer

2015-02-11 04:57:59 -08:00

Model.php

Fixes #948 - validate on model name+modelno+manufacturer combination

2015-08-06 05:58:50 -07:00

Setting.php

Allow > tags for custom CSS to modify bootstrap

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

Statuslabel.php

Added validation for notes

2015-08-12 22:34:35 -07:00

Supplier.php

Fixed all issues that were reported by @leobg

2015-07-20 21:34:19 -04:00

Throttle.php

Fix eager loading for user throttle

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

User.php

Removed extra method

2015-10-16 01:20:31 -07:00