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

..

AccessoriesController.php

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

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

AssetMaintenancesController.php

Fixed all issues that were reported by @leobg

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

AssetsController.php

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

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

CategoriesController.php

Fixes #1077 - ordering of dropdown menus

2015-08-19 10:43:52 -07:00

ConsumablesController.php

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

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

DashboardController.php

Eager load dashboard queries

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

DepreciationsController.php

Change paginate to get for Index

2014-10-27 12:14:55 +10:30

GroupsController.php

Prevent group altering from trolling douchebags

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

LicensesController.php

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

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

LocationsController.php

Fixes #1102 - default currency stored as htmlentities in the DB

2015-08-21 18:11:23 -07:00

ManufacturersController.php

Fixes #387 - sortable asset view by manufacturer

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

ModelsController.php

Fixes #1077 - ordering of dropdown menus

2015-08-19 10:43:52 -07:00

ReportsController.php

Fixes #1078

2015-08-19 10:23:01 -07:00

SettingsController.php

Prevent generating backups, deleting files and file downloads in demo mode

2015-09-15 02:32:19 -07:00

StatuslabelsController.php

Added ability to select status type

2015-08-12 22:33:56 -07:00

SuppliersController.php

First pass at this, the ugly way. Just to see wha it looks like.

2015-07-26 18:15:06 -07:00

UsersController.php

Accessories fix for #1204

2015-10-06 15:58:03 -07:00