ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,234 Commits 84 Branches 293 Tags
41127bf5ddddc19f7df107df4c05ca971d8430d8
Commit Graph

118 Commits

Author SHA1 Message Date
Vincent Sposato 41127bf5dd Added scope to the Asset model to pull all assets that belonged to a list of models 2015-08-01 12:14:21 -04:00
madd15 f9c7022bcc Add checkin_email() 2015-07-24 12:01:21 +09:30
Vincent Sposato d1d6fe26a6 Fixed all issues that were reported by @leobg 
Also, renamed and fixed items of concern by @snipe
Renamed Improvements to Asset Maintenances
 2015-07-20 21:34:19 -04:00
Vincent Sposato e479575825 Added all of the functionality for the Improvement to be linked to the Asset 2015-07-20 21:11:17 -04:00
Vincent Sposato 1c4190bf22 Added the relation to the improvement to the model, so that we can reference these items 2015-07-20 21:02:21 -04:00
Brady Wetherington c683c1c57e Revert "Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking" 
This reverts commit 41b711740a, reversing
changes made to 55309bfaef.

It also un-reverts reversions that were done inadvertently.
 2015-07-20 17:12:28 -07:00
snipe 41b711740a Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking 
# Conflicts:
#	app/controllers/admin/ReportsController.php
#	app/lang/en/general.php
#	app/routes.php
#	app/views/backend/hardware/view.blade.php
#	app/views/backend/layouts/default.blade.php
#	composer.lock
 2015-07-20 16:12:35 -07:00
snipe 4a5066054b Display bugfixes for #819 2015-07-08 22:38:35 -07:00
snipe 84ffc1a728 Migration for location-specific currency, updated views for #819 
This isn't done yet though. All kinds of busted stuff.
 2015-07-08 20:35:40 -07:00
snipe 74429d9075 Merge remote-tracking branch 'origin/develop' into 2.0 
# Conflicts:
#	app/lang/en/general.php
#	app/start/artisan.php
#	app/views/backend/hardware/edit.blade.php
#	app/views/backend/layouts/default.blade.php
 2015-07-08 18:07:53 -07:00
snipe de23ec5785 Fixes #544 - disable checking an asset out to a user if it is not a deployable status 2015-07-08 17:18:46 -07:00
snipe 7da7907fbd Merge remote-tracking branch 'origin/develop' into 2.0 
# Conflicts:
#	app/controllers/admin/AssetsController.php
 2015-07-06 19:29:06 -07:00
snipe f855bfd4ef Better error checking for eol data 2015-07-06 14:09:48 -07:00
Vincent Sposato 1b423f5b54 Fixed all issues that were reported by @leobg 
Also, renamed and fixed items of concern by @snipe
Renamed Improvements to Asset Maintenances
 2015-07-06 10:36:54 -04:00
snipe 7d5810b656 Merge remote-tracking branch 'origin/develop' into 2.0 
# Conflicts:
#	app/config/version.php
#	app/controllers/admin/AssetsController.php
 2015-07-02 17:23:06 -07:00
snipe 552bdfdc2d Switched defaultLoc to belongsTo relationship 2015-07-02 16:51:52 -07:00
Vincent Sposato c90ea92a4e Added all of the functionality for the Improvement to be linked to the Asset 2015-06-27 14:37:40 -04:00
Vincent Sposato 3a86c53b49 Added the relation to the improvement to the model, so that we can reference these items 2015-06-27 12:27:15 -04:00
snipe fc1e8a4e4e Minor comment tweak 2015-06-23 15:05:21 -07:00
snipe 94f8c61720 Fixes #280, #64 and #860 - added license expiration alert 2015-06-23 01:52:06 -07:00
snipe a0fce2e0fb Fixes #766 
Should be refactored to make the Action logger into a base class and to use polymorphic relationships for the IDs, and migrate accessory_id into asset_id in the log table. This was quick and dirty.
 2015-04-29 16:14:08 -07:00
madd15 7d9c90f8dd Only pull eula if set to use default in category 2015-04-01 08:51:40 +10:30
snipe 5d946b19cb Fixed checkmodel at route level 2015-03-27 17:44:49 -07:00
snipe 605d0ed8e1 Moved checkModel into model from controller 2015-03-27 13:45:37 -07:00
snipe 35bbea3052 Fixes #688 - show model if no asset name 2015-03-24 17:08:15 -07:00
snipe 4243710378 Added location to new assets view 2015-03-14 01:30:12 -07:00
snipe 2244c60499 Added category to output 2015-03-13 20:32:47 -07:00
snipe b2af86230a Added fields 2015-03-12 19:52:03 -07:00
snipe f27fb90457 Allow override of checkin/checkout date 
TODO: fix error if someone enters non-date text
 2015-03-04 18:59:45 -08:00
madd15 9f3edd701b Fixes #565 - Soft Delete Models and Allow Restore 
Allow models to be deleted and restored which in turn allows deleted
hardware to function when model is deleted.
 2015-02-26 22:35:57 +10:30
snipe ad39ec1dc3 Added markdown to EULA 2015-02-25 11:25:10 -08:00
snipe 097bb38a23 Fixes #163 - accept acceptance + eula 
TODO: Language strings, check that the accepting user is the one that should be allowed to accept.
 2015-02-24 22:15:36 -08:00
snipe cb51dc45b6 Extend report to 60 days 2015-02-24 03:49:22 -08:00
snipe e04ac89c5a Added expiring warrantee alerts 2015-02-24 02:07:33 -08:00
Splaer 70ae59ed62 Fixed a bug when no assets are in table that the autoincrement method blows up. Also optimzed the logic to get max id instead of popping top off creation date. 2015-02-19 12:52:27 -05:00
madd15 ae104293da #539 - Allow checked out asset in requestable 2015-02-19 08:20:27 +10:30
Brady Wetherington 063e5c407c Fixed the depreciation report, fixes to calculate current depreciated 
value (which were only used there). Additional fixes and refactoring
around Depreciable, in terms of how assets get depreciation via models,
and licenses get depreciation directly.
 2015-02-17 18:51:13 -08:00
Brady Wetherington 3ba02b65fb Oops - Assets get their Depreciation from their *model* - wheras 
Licenses have a Depreciation directly associated with them. So I
pulled the Depreciation relationship out of Depreciable so that both
Assets and Licenses could pull their depreciations in their associated
ways. I could've done this with an inheritance call, but that seems
a bit much (and unnecessarily confusing).
 2015-02-17 17:56:59 -08:00
Brady Wetherington 88dc0700f0 Make date functions work; create negative intervals for depreciation, 
Also renamed "months_until_depreciation" to "time_until_depreciation"
And renamed Depreciatable to Depreciable (which is an actual word in
English.) Also a cleanup/consistency-enforcement for interval display.
 2015-02-17 17:40:16 -08:00
Brady Wetherington 1e4071b51d First stab at cleaning up Depreciation 
Conflicts:
	app/models/Asset.php

It looks like the same time I pulled depreciation out of the
Asset class, uploads were being added in. It doesn't look
like a conflict to me, but git couldn't figure it out. Oh Well.
 2015-02-17 17:39:39 -08:00
snipe ea6a6d098a Fixes #440 - removed unique constraint on serial 2015-02-17 14:15:22 -08:00
snipe 24f5cdc743 Fixes #523 - added file uploads to assets 2015-02-16 13:49:51 -08:00
snipe ec1ab6913e Merged layout blades for unified nav 2015-02-16 12:55:32 -08:00
snipe f57c61dd4d Possible fix for #518 - license count issue 2015-02-12 12:25:22 -08:00
snipe e343c157c5 Fixed naming conflict for requestable 2015-02-11 12:49:21 -08:00
snipe 35a133bbf9 Fixes #382 - allow admins to restore deleted assets 2015-02-11 04:44:39 -08:00
snipe ab1c921443 Requestable assets views and controllers 2015-02-10 23:55:06 -08:00
snipe 9bcc9a7ed1 Check not deleted 2015-02-10 18:27:00 -08:00
snipe 7715731c4a Fix count in header 2015-02-10 18:26:35 -08:00
snipe 5867c60410 Fixed scope chaining on assigned_to 2015-02-10 17:58:47 -08:00