DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 06:59:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
1242 commits 101 branches 268 tags 288 MiB
Commit graph

1242 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 30f0f6f527 Export users to CSV 
Bypasses the weird limit bug in the javascript
 2016-10-25 02:41:34 -07:00
snipe b839741069 Merge branch 'hotfixes/order_number_numeric' into develop 2016-10-19 15:03:05 -07:00
snipe d7434797ec Change order number to string in components table 2016-10-19 14:59:28 -07:00
Daniel Meltzer 85af8e46e3 Set a user_id of -1 if there isn't a logged in user. This fixes the CLI importer, and opens the door in the future for some sort of virtual importer user... which may fix other issues the importer currently has (#2775) 2016-10-17 11:07:08 -07:00
snipe 0a0006c68c Fixes #2774 - change order_number to string in components and consumables 2016-10-14 13:12:17 -07:00
Daniel Meltzer e85241af6a Log checkouts (#2772) 
* Ensure the log has a target before trying to fetch the associated company

* Log creation of items, both in importer and manually
 2016-10-12 18:45:32 -07:00
snipe 219ef23126 Fixes #2713 - error displayed with license checked out to asset 2016-10-12 14:32:21 -07:00
snipe 31898d0f85 Fixes #2751 - asset tag added to asset maintenance report 2016-10-12 14:18:51 -07:00
snipe 1e82058f4d Fixes #2763 - added missing translations methods for dashboard 2016-10-12 13:01:29 -07:00
snipe b3329135df Merge branch 'develop' of github.com:snipe/snipe-it into develop 2016-10-12 12:50:35 -07:00
snipe 2350c1c15c Fixes #2352 2016-10-12 12:50:30 -07:00
snipe 8f4e016c01 Fixes #2768 and #2753 2016-10-12 12:48:37 -07:00
Daniel Meltzer 8e60767c00 Guard against null values in the reports generator. May fix #2758 (#2762) 2016-10-12 12:06:38 -07:00
Daniel Meltzer 2e0a7abbe9 Rework permissions view (#2756) 
* Early layout work on a cleaner permissions interface

* Cleanup layout.  Make new permissions view work.  Still needs some css and javascript improvements.  Also need to do the same thing to the group view.

* Improve styling, add javascript to toggle an entire group of permissions if choosing the permission on the header row.  Would be nice to add collapsing of sections in the future.

* Toggle viewing sections.

* Special case places where we only have one item in a group to only display the item once.

* Filter getCreate the same way.
 2016-10-12 12:06:28 -07:00
Matthias Frei 4b6ba6cb30 BugFix: Asset name was not included in custom report (#2733) 
* BugFix: Asset name was not included in custom report

* BugFix: Custom Asset Report did not escape commas in custom fields. So the csv file is inconsistent, if a custom field containes a comma.  Added an escape function which escapes the commas with a backslash.
A csvreader can be configured to handle the escape character.
 2016-10-12 12:05:49 -07:00
snipe fe5e813970 Updated translations 2016-10-04 12:23:02 -07:00
snipe d6f7e03431 Bumped version for pre-release 2016-10-04 11:58:19 -07:00
snipe 87f50dfd10 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2016-09-29 22:37:59 -07:00
snipe 85ddb9cfff Bumped version 2016-09-29 22:37:54 -07:00
Michael T c6338d6a8b Apologies. Still learning Git, and CentOS isn't a big strength for me. (#2701) 
This should properly include #2674
Cleaned up the script itself, added progress bars so end users don't think the script is stuck
 2016-09-29 22:37:05 -07:00
Daniel Meltzer b92d26f3c4 When checking out a consumable, don't say asset (#2718) 2016-09-29 22:20:58 -07:00
Daniel Meltzer 2a95a95e00 Company to logs (#2717) 
* Fix the actionlog/companyables problem by adding a company_id to all actionlogs and scoping directly on that.  Works around bugs in laravel where trying to hunt down the polymorphic relationship would lead to an infinite loop

* Scope companyables in getactivityreport.  Also eager load.

* Improve reportscontroller, work on seeder to test this.

* Only show company users in checkout dialogs

* If no admin associated with log, it might be a request.  Leave blank instead of saying deleted admin

* When injecting company_id, use target instead of user if user is a superadmin

* Build up the seeder to generate users, companies, and logs.

* Eager load the log, don't scope the users log because the log should already include things only related to the user.
 2016-09-29 22:20:49 -07:00
snipe b41883c125 Use user object to prevent errors on deleted users 2016-09-29 11:37:38 -07:00
snipe 0a218a37d0 Check that the user exists before trying to get location id 2016-09-29 10:32:09 -07:00
Brady Wetherington 7ca7877740 Fix mismerged code. (#2705) 2016-09-28 22:57:19 -07:00
snipe 1394424760 Merge branch 'hotfixes/customfields_in_asset_report' into develop 
# Conflicts:
#	resources/views/models/custom_fields_form.blade.php
 2016-09-28 19:28:55 -07:00
snipe fc07753a5c Use $customfields in closure 2016-09-28 19:18:01 -07:00
snipe 7bbe85801e Fixed typo :( 2016-09-28 15:45:05 -07:00
snipe 8774927b91 PHPStorm lag = fail 2016-09-28 15:40:51 -07:00
snipe 8cb4954f8a Apply encrypted fields patch from develop 2016-09-28 14:58:01 -07:00
snipe 48b52a0ccc Merge branch 'hotfixes/p-typo' into develop 2016-09-28 08:59:07 -07:00
snipe 9ecb0e6ca1 Fixed errant typo 2016-09-28 08:58:16 -07:00
snipe 9091385182 Merge branch 'hotfixes/purchase_cost' into develop 
# Conflicts:
#	app/Http/Controllers/ReportsController.php
#	config/version.php
 2016-09-27 19:13:21 -07:00
snipe b90c0de822 Fix companyable reult in maintenances 2016-09-27 19:07:45 -07:00
snipe ee2522571c Fixes #2673 2016-09-27 19:07:30 -07:00
snipe d3a13bcd45 Functional config for laravel 5 2016-09-27 18:47:00 -07:00
snipe 67f199b09d Added customfields to asset CSV export 2016-09-27 15:09:47 -07:00
snipe f1c458185d Client-side pagination on asset report for faster loading 2016-09-27 14:56:05 -07:00
snipe ed22ec4b36 Bumped hash 2016-09-27 08:42:55 -07:00
snipe fa72e64b98 Add checkout date to asset report 2016-09-27 08:42:48 -07:00
snipe 2a8ab06ca3 Remove escaping for CSV to prevent weird encoding 2016-09-27 07:25:28 -07:00
snipe 61d07bdc7c Sigh. 2016-09-27 07:24:26 -07:00
snipe 3061ce2983 Missed delimiter for CSV 2016-09-27 07:23:30 -07:00
snipe e9f3d622f5 Add company name to custom asset report 2016-09-27 07:19:52 -07:00
snipe 1e3244b2b3 Merge branch 'hotfixes/eol' into develop 
# Conflicts:
#	app/Http/Controllers/AssetModelsController.php
 2016-09-27 07:04:45 -07:00
snipe a92bfe8ade Default EOL to null, not 0, if no value entered 2016-09-27 06:53:59 -07:00
snipe c42dfadd17 Merge branch 'hotfixes/purchase_order' into develop 
# Conflicts:
#	app/Http/Controllers/LicensesController.php
 2016-09-27 01:31:02 -07:00
snipe 0a391de09f Fixes #2682 - search on purchase_order 2016-09-27 01:29:31 -07:00
snipe b6cc7e7c14 Fixes bug where 12-hour fprmat for hours was used 2016-09-26 22:35:51 -07:00
snipe 819ca2921b Fixes bug where 12-hour format was used for hours 2016-09-26 22:34:09 -07:00