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

# Conflicts:
#	.gitignore
#	app/config/production/session.example.php
#	app/config/staging/session.example.php
#	app/config/version.php
#	app/models/User.php

2015-07-09 01:02:49 -07:00

..

Accessory.php

EULA/req improvements

2015-02-26 18:20:52 -08:00

Actionlog.php

Add consumables log

2015-06-23 11:52:07 -07:00

Asset.php

Display bugfixes for #819

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

Authentication.php

TidyUp: Remove excess whitespace.

2014-12-24 22:34:16 +00:00

Category.php

EULA/req improvements

2015-02-26 18:20:52 -08:00

Consumable.php

Consumables section

2015-06-09 19:50:34 -07:00

Depreciable.php

"Years" turn out to be 12 times longer than months, apparently

2015-04-08 16:36:06 -07:00

Depreciation.php

First stab at cleaning up Depreciation

2015-02-17 17:39:39 -08:00

Elegant.php

First stab at cleaning up Depreciation

2015-02-17 17:39:39 -08:00

Group.php

alpha 0.4.0 release candidate

2014-08-11 17:13:43 +09:00

License.php

Fixes #280, #64 and #860 - added license expiration alert

2015-06-23 01:52:06 -07:00

LicenseSeat.php

Added new 4.2 SoftDeletingTrait

2015-02-04 15:50:40 -08:00

Location.php

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

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

Manufacturer.php

Fixes #387 - sortable asset view by manufacturer

2015-02-11 04:57:59 -08:00

Model.php

Remove unique from modelno validation rule

2015-07-07 09:50:43 +09:30

Setting.php

Automated backup to dump SQL and zip uploaded files

2015-06-22 15:52:26 -07:00

Statuslabel.php

Added undeployable as allowed validation type

2015-02-10 18:06:55 -08:00

Supplier.php

Added new 4.2 SoftDeletingTrait

2015-02-04 15:50:40 -08:00

Throttle.php

Fix eager loading for user throttle

2015-03-17 15:36:11 -07:00

User.php

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

2015-07-09 01:02:49 -07:00