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

57 Commits

Author SHA1 Message Date
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 3df0550b19 Built the report and the export for the Improvements report 
Added the links on the navigation
 2015-07-20 21:26:23 -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
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
Vincent Sposato 269f73205a Built the report and the export for the Improvements report 
Added the links on the navigation
 2015-06-28 15:00:55 -04:00
snipe 1fb2878772 Updated activity report for consumables 2015-06-25 18:47:03 -07:00
snipe 9cf03e2e60 Better escaping on activity report page 2015-05-27 10:16:06 -07:00
snipe bbdbd5397c Check for valid asset before attempting to get name 2015-05-04 00:46:26 -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
snipe d61506fcf7 Fixes for #766 - add activity report 2015-04-29 14:50:12 -07:00
snipe d58cc8d490 Herp derp plural 2015-03-27 21:48:47 -07:00
snipe 0c827b318b Default location fix 2015-03-27 21:48:04 -07:00
madd15 35f3350ddf Remove duplicate status 2015-03-13 12:56:09 +10:30
madd15 6bab442651 removed duplicate icon-white 2015-03-10 13:51:20 +10:30
madd15 379f6bef6c catergories lang and serveral icons 2015-02-26 23:48:17 +10:30
snipe 323a607130 Indenting formatting 2015-02-26 00:22:02 -08:00
snipe ca1351b704 Switched to all FA 2015-02-25 18:14:51 -08:00
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
snipe ec1ab6913e Merged layout blades for unified nav 2015-02-16 12:55:32 -08:00
snipe f72b385790 Fix licenses so null instead of 0 2015-02-10 20:46:58 -08:00
snipe d2438f9fdb Fixes #502 - normalized statuses 2015-02-10 15:57:19 -08:00
snipe e67ba8a743 Fix reporting error on depreciation 2015-02-04 16:13:11 -08:00
snipe bf96aae9d9 Truncate license in report 2014-11-21 07:32:12 -05:00
snipe 53f279f55f Language string for "generate" 2014-11-12 17:34:22 -05:00
snipe 53951c8bbc Nicer custom reports form layout 2014-11-12 17:32:48 -05:00
Madd15 40b0ced8da Update Lang for error and info 2014-11-13 08:02:39 +10:30
Madd15 6d2a073d04 Custom Asset Report 2014-11-12 16:05:59 +10:30
Madd15 c60e40096a Replace static titles with lang 2014-11-12 13:38:31 +10:30
Madd15 74ae2fceea Fix class on th 2014-11-12 13:34:53 +10:30
Madd15 02605bdf69 Add Asset Report with Reduced Load Time 2014-11-12 12:03:33 +10:30
Madd15 432e348e56 Add Report Controller and License Report 2014-11-12 12:02:55 +10:30
snipe bf1e075551 Fixes #87 - made datatables responsive 2014-10-16 17:46:47 -04:00
root b8a4c7e4d6 Initial COMMIT to set the file modified tracking. No changes made. 2014-08-05 13:22:08 +09:00
snipe 8b914102b7 Updated spacing for PSR-2 2014-06-24 17:49:39 -04:00
snipe 3e7a9e45d1 Fixes PR #168 and #167 2014-06-23 19:40:09 -04:00
snipe 08d05b481f Fixes #158 2014-06-19 16:10:00 -04:00
snipe c937796224 More language strings, per #151 2014-06-09 21:30:58 -04:00
snipe 74653d3480 More refactoring of language structure, language strings per #151 2014-06-09 19:56:47 -04:00
snipe cd0f42c508 Alphabetized language files, more for #151, refactoring language string hierarchy. 2014-06-09 17:45:52 -04:00
snipe c21c3a4a9e Removed erroneous PDF option 2014-05-06 03:38:51 -04:00
snipe 57e903a926 Added Diff language string 2014-05-06 00:10:29 -04:00
snipe 67aba76d3f Fixing this change from #109 that somehow got reverted 2014-05-05 23:41:41 -04:00
snipe b2912195ac Added EOL to report view 2013-12-10 14:56:16 -05:00
snipe e784854e05 Changed column from asset name to model 2013-12-03 04:24:34 -05:00
snipe ae05f27015 Fixed depreciation bug 2013-12-03 02:05:00 -05:00
Desmond Morris 0d46eba76e Updates csv export link path 2013-12-01 22:23:55 -05:00
snipe 030db6e267 Upgrading to bootstrap 3 
Ugh.
 2013-11-29 04:10:25 -05:00