snipe 527650d03b Merge branch 'patch-5' of https://github.com/DanielNemanic/snipe-it into DanielNemanic-patch-5 ...

# Conflicts:
#	app/views/backend/models/view.blade.php

2015-05-02 12:28:34 -07:00

..

accessories

Fixes for #722 datatables

2015-04-02 14:55:36 -07:00

categories

Fixes for #722 datatables

2015-04-02 14:55:36 -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

Fixes for #722 datatables

2015-04-02 14:55:36 -07:00

layouts

Fixes for #766 - add activity report

2015-04-29 14:50:12 -07:00

licenses

Fixes #729 - CSS wordwrap for long licenses

2015-04-30 18:17:44 -07:00

locations

Fix #737 -Only display comma & address2 if not Null

2015-04-10 09:14:59 +09:30

manufacturers

update icon

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

models

Update view.blade.php

2015-04-15 09:05:02 +02:00

reports

Fixes #766

2015-04-29 16:14:08 -07:00

settings

Slack field validation and placeholder text

2015-04-30 16:58:33 -07:00

statuslabels

update icon

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

suppliers

Fixes #718 - uppercase state/country abbreviations

2015-04-01 15:31:53 -07:00

users

Fixes #774 - layout issue on profiles

2015-04-29 23:21:04 -07:00

dashboard.blade.php

Fixes #757 - use showAssetName method

2015-04-29 16:22:25 -07:00