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

# Conflicts:
#	app/commands/ImportCommand.php
#	app/lang/en/admin/users/message.php
#	app/lang/en/general.php

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

..

accessories

Fixed language string

2015-07-08 13:05:17 -07:00

asset_maintenances

Updated language files

2015-07-27 10:25:35 -07:00

categories

Updated language files

2015-07-27 10:25:35 -07:00

consumables

Updated language files

2015-07-27 10:25:35 -07:00

depreciations

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

groups

New language strings

2015-04-13 11:26:02 -07:00

hardware

Fixes #1010 - better errors on large file uploads

2015-08-04 12:45:17 -07:00

licenses

Fixes #1010 - better errors on large file uploads

2015-08-04 12:45:17 -07:00

locations

Disllow delete if parent

2015-07-28 20:45:32 -07:00

manufacturers

Fixed english language string

2014-11-12 15:52:08 -05:00

models

more model functionality and icons

2015-02-27 00:53:16 +10:30

reports

New reports language files

2014-11-12 17:05:46 -05:00

settings

Updated language files

2015-07-27 10:25:35 -07:00

statuslabels

Updated language strings

2015-02-10 20:52:22 -08:00

suppliers

Lang changes for new licenses functions

2014-11-06 14:15:09 +10:30

users

Fixes #1010 - better errors on large file uploads

2015-08-04 12:45:17 -07:00