DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 06:04:08 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
974 commits 101 branches 268 tags 320 MiB
Commit graph

974 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 683b3bcdc1 Merge remote-tracking branch 'origin/develop' 2016-10-27 15:34:03 -07:00
snipe a929b635ff Fixes #2809 - adds serial number to components 2016-10-27 15:33:48 -07:00
snipe d7296462ac Merge remote-tracking branch 'origin/develop' 2016-10-27 15:03:03 -07:00
snipe 9c3c611b37 Fixes #2825 - columns misaligned when older display_asset_name field set to 1 2016-10-27 15:02:32 -07:00
snipe 2f72d97f24 Merge remote-tracking branch 'origin/develop' 2016-10-27 14:33:24 -07:00
snipe 3e701c6dd1 Fixes #2814 - adds job title to users listing display 2016-10-27 14:29:07 -07:00
snipe e4140f4c48 Fixes #2817 - adds EOL to custom report 2016-10-27 14:20:55 -07:00
snipe 61ecbf91bc Merge remote-tracking branch 'origin/develop' 2016-10-26 11:28:14 -07:00
snipe 691f9b621e Fixes #2821 2016-10-26 11:27:37 -07:00
snipe 52b6298098 Merge remote-tracking branch 'origin/develop' 2016-10-26 11:23:03 -07:00
snipe ccb844acd6 Fixed #2800 - use DBTablePrefix() for raw queries 2016-10-26 11:21:36 -07:00
snipe a0a6a23232 Merge remote-tracking branch 'origin/develop' 2016-10-26 10:32:50 -07:00
snipe 43404e427d Bumped version 2016-10-26 10:31:13 -07:00
snipe d7222ae1f0 Fix for defaultLoc in asset view 2016-10-26 10:12:16 -07:00
snipe ad1d6529a7 Merge branch 'master' of github.com:snipe/snipe-it 2016-10-26 10:09:59 -07:00
Daniel Meltzer 7790f9e91f Fix #2813 (#2819) 
Looks like a copypasta miss.  Should fix the exception thrown in #2813.
 2016-10-26 10:01:24 -07:00
Daniel Meltzer a418dece80 Better checking for empty values when updating. (#2811) 
* Better checking for empty values when updating.  There's a lot of conditionals in here that we may want to look at cleaning up over time

* Fix typo.  No manfacturers here.

* Fix model update/import.  Also hardcode the status id of unset assets to the first existing one instead of an id that may not exist... Still not ideal, but better.

* Let requests to .env through the middleware.  We check to see if this is readable during setup as a warning, and as it stands it triggers an infinite loop trying to hit the file.
 2016-10-25 19:51:13 -07:00
snipe f30631efb6 Fixed parens on target 2016-10-25 12:53:07 -07:00
snipe f156ec58b6 Bumped version 2016-10-25 12:38:18 -07:00
snipe f9a06a183e Updated language strings 2016-10-25 12:30:52 -07:00
snipe da0b6d4d90 Merge branch 'hotfixes/fix_typo_in_permissions_for_accessories_create' into develop 2016-10-25 11:40:34 -07:00
snipe 40befa7b37 Fixes #2792 - corrected typo in permissions array for creating accessories 2016-10-25 11:38:24 -07:00
snipe 66585bcc40 Merge branch 'hotfixes/eagerload_license_checkout' into develop 2016-10-25 11:12:32 -07:00
snipe d57135c81b Removed unused helper methods, added docblocks 2016-10-25 11:11:47 -07:00
snipe f976f440ef Fixes #2808 - eager loading user objects for licenses 2016-10-25 10:52:37 -07:00
snipe 0728a991a8 Merge branch 'hotfixes/datepicker_for_date_custom_field' into develop 
# Conflicts:
#	resources/views/models/custom_fields_form.blade.php
 2016-10-25 05:18:55 -07:00
snipe 33a0c2087a Use datepicker if custom field format is a date 2016-10-25 05:16:41 -07:00
snipe 59ce46dce7 Merge branch 'hotfixes/use_modelno_if_no_name_in_import' into develop 2016-10-25 03:53:45 -07:00
snipe 2dbd1089f5 Use model number if model name is blank 2016-10-25 03:53:19 -07:00
snipe 85f3cc1762 Merge branch 'hotfixes/add_username_to_csv_export' into develop 2016-10-25 02:51:27 -07:00
snipe 1793461642 Added username, fixed duplicate company name 2016-10-25 02:50:23 -07:00
snipe d24c4b1152 Merge branch 'hotfixes/export_all_users' into develop 2016-10-25 02:42:20 -07:00
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