snipe b3249dcf48 Merge remote-tracking branch 'origin/develop' into 2.0 ...

# Conflicts:
#	app/controllers/admin/UsersController.php
#	app/models/Model.php
#	app/views/backend/hardware/edit.blade.php
#	app/views/backend/users/index.blade.php
#	composer.lock

2015-08-11 13:20:25 -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

Add Expected Checkin Date

2015-07-23 11:53:07 +09:30

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

Merge remote-tracking branch 'origin/develop' into 2.0

2015-08-11 13:20:25 -07:00

index.blade.php

Fixes #1009 - Add MAC address to search

2015-08-06 05:13:27 -07:00

labels.blade.php

Merge remote-tracking branch 'origin/develop' into 1.3.0

2015-05-27 11:17:14 -07:00

qr-view.blade.php

Beginning QR mobile interface

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

view.blade.php

Fix dup file uploads and layout

2015-07-24 12:24:10 +09:30