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

..

accessories

Fix #972 - Change back button to work

2015-07-29 10:13:18 +09:30

asset_maintenances

Fixed all issues that were reported by @leobg

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

categories

Add Email on Checkin Field

2015-07-24 10:25:11 +09:30

consumables

Bringing back the spinner on processing screen

2015-07-09 03:56:18 -07:00

depreciations

update icon

2015-03-10 13:38:50 +10:30

groups

Fix update button to goto right group

2015-04-07 13:31:56 +09:30

hardware

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

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

layouts

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

2015-08-04 12:51:35 -07:00

licenses

Add title and content to delete modal

2015-07-10 09:57:03 +09:30

locations

Display bugfixes for #819

2015-07-08 22:38:35 -07:00

manufacturers

update icon

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

models

Add manufacturer to models listing for clarity

2015-06-30 19:15:43 -07:00

reports

Fixed issue with Asset model

2015-08-07 18:52:19 -04:00

settings

Migration for location-specific currency, updated views for #819

2015-07-08 20:35:40 -07:00

statuslabels

update icon

2015-03-10 13:56:51 +10:30

suppliers

Fixed issue found with date being handled incorrectly

2015-07-20 21:16:06 -04:00

users

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

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

dashboard.blade.php

Added request to dashboard

2015-07-30 14:59:24 -07:00