snipe 5ff75e7f42 Merge remote-tracking branch 'origin/develop-bootstrap-tables-integration' into develop ...

# Conflicts:
#	app/controllers/admin/CategoriesController.php
#	app/views/backend/accessories/view.blade.php
#	app/views/backend/categories/index.blade.php
#	app/views/backend/settings/edit.blade.php

2015-10-21 23:06:43 -07:00

..

AccessoriesController.php

Merge remote-tracking branch 'origin/develop-bootstrap-tables-integration' into develop

2015-10-21 23:06:43 -07:00

AssetMaintenancesController.php

Asset maintenances for #1266

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

AssetsController.php

Added hidden ID column

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

CategoriesController.php

Merge remote-tracking branch 'origin/develop-bootstrap-tables-integration' into develop

2015-10-21 23:06:43 -07:00

ConsumablesController.php

Merge remote-tracking branch 'origin/develop-bootstrap-tables-integration' into develop

2015-10-21 23:06:43 -07:00

DashboardController.php

Eager load dashboard queries

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

DepreciationsController.php

Corrected delete modal string for #1266

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

GroupsController.php

Prevent group altering from trolling douchebags

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

LicensesController.php

Added hidden ID column

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

LocationsController.php

Added hidden ID field for #1266

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

ManufacturersController.php

Corrected delete modal string for #1266

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

ModelsController.php

Fixes skip/offset for #1266

2015-10-21 14:49:24 -07:00

ReportsController.php

Fixes Purchase Cost not showing up on custom reports

2015-10-21 20:24:07 -05:00

SettingsController.php

Added option to select brand type text or logo or text + logo

2015-10-12 20:34:12 +02:00

StatuslabelsController.php

Corrected delete modal string for #1266

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

SuppliersController.php

Corrected delete modal string for #1266

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

UsersController.php

More responsive fixes

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