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

..

accessories

Added new fields to index view

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

asset_maintenances

Asset maintenances for #1266

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

categories

Fixed categorys page

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

consumables

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

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

custom_fields

Terribly rough Custom Fields creation

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

depreciations

Depreciations bootstrap tables for #1266

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

groups

Make groups table responsive

2015-10-21 22:41:50 -07:00

hardware

Merge branch 'develop' into custom_fields

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

layouts

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

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

licenses

Load table export helpers locally

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

locations

Load table export helpers locally

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

manufacturers

Load table export helpers locally

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

models

Merge branch 'develop' into custom_fields

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

reports

Nicer activity report display

2015-10-21 23:39:45 -07:00

settings

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

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

statuslabels

Load table export helpers locally

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

suppliers

Nicer (tho non-ajaxy) table

2015-10-21 21:23:58 -07:00

users

Fixed indenting

2015-10-21 21:31:38 -07:00

dashboard.blade.php

Fixes #1038 - clickable links in dashboard

2015-08-17 11:24:10 -07:00