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

..

bulk.blade.php

Add requestable as bulk-edit option

2015-07-30 14:32:25 -07:00

checkin.blade.php

update icon

2015-03-10 13:31:04 +10:30

checkout.blade.php

Fixes #1081- include asset name on checkout

2015-08-19 11:13:51 -07:00

clone.blade.php

update icon

2015-03-10 13:29:57 +10:30

datatable.blade.php

Basic QR code printing

2015-03-19 18:06:50 -07:00

edit.blade.php

Terribly rough Custom Fields creation

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

import-status.blade.php

Temp placeholder file - need to ajaxify this

2015-09-23 20:37:06 -07:00

import.blade.php

Add the newly uploaded row to the table

2015-09-23 19:18:28 -07:00

index.blade.php

Merge branch 'develop' into custom_fields

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

labels.blade.php

Smaller font size for labels to prevent them from getting cut off

2015-09-09 14:11:15 -07:00

qr-view.blade.php

Beginning QR mobile interface

2015-06-30 19:07:44 -07:00

view.blade.php

Merge branch 'develop' into custom_fields

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