DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-11 08:04:09 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
11947 commits 97 branches 266 tags 292 MiB
Commit graph

11947 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 96f7f49b68 Fixed response docblock 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 16:40:49 +01:00
snipe 8c93e79397
Merge pull request #13787 from inietov/fixes/errorexception_undefined_array_key 
Fixed ErrorException: Undefined array key in importer blade [sc-23864]
 2023-10-25 07:47:48 +01:00
snipe 4d345168d6
Merge pull request #13786 from svpernova09/map-docker-logs-to-storage 
Map Snipe-IT logs to storage logs folder
 2023-10-25 07:20:22 +01:00
Ivan Nieto Vivanco f2f3931fa9 Formatting correctly 2023-10-24 11:26:37 -06:00
Joe Ferguson c919cd31fa
Map Snipe-IT logs to storage logs folder 
For docker-compose.yml usage to prevent error messages.
 2023-10-24 11:31:02 -05:00
snipe 9d2d13bb59
Merge pull request #13784 from snipe/fixes/fixed_accessory_not_found_string 
Fixed accessory not found string
 2023-10-24 17:03:13 +01:00
snipe 944520bc5d Fixed notification formatting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-24 17:02:16 +01:00
snipe aae289e150 Added missing string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-24 17:02:07 +01:00
snipe c756849497 Removed debug line 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-24 17:01:51 +01:00
snipe 29f438123e
Merge pull request #13777 from Robert-Azelis/Robert-Azelis-Cutom_Report_FIX 
[FIX] Custom report - date fields error
 2023-10-24 10:27:58 +01:00
Ivan Nieto Vivanco 0c5d54dfde Create the language string to show in the importer GUI indicating the file is empty 2023-10-23 22:09:17 -06:00
Ivan Nieto Vivanco 49f6eef9df Places a text indicating that the file is empty and display it as an info text 2023-10-23 21:57:35 -06:00
Ivan Nieto Vivanco 8f8e5cb723 Adds condition to only process CSV if is not empty 2023-10-23 21:47:10 -06:00
snipe d5598b3322
Merge pull request #13778 from Robert-Azelis/Robert-Azelis-Dashboard_impr 
[Improvement] Dashboard
 2023-10-23 18:00:00 +01:00
Robert-Azelis 309f30f630
Update view.blade.php 
display marker if date of EOL is expired and show real EOL rate as diff between purchase date and eol date
 2023-10-22 18:38:59 +02:00
Robert-Azelis 04a867d12b
Update eol_date.blade.php 
read EOL date from database instead calculate on the base model EOL rate
 2023-10-22 18:32:20 +02:00
Robert-Azelis e62636b3a5
Update AssetModelPresenter.php 
display name 'EOL rate' instead of 'EOL'
 2023-10-22 18:27:53 +02:00
Robert-Azelis 4e20a241ce
Update AssetPresenter.php 
display name 'EOL rate' instead of 'EOL'
 2023-10-22 18:26:19 +02:00
Robert-Azelis 30cc498a16
Update AssetObserver.php 
update exlicit marker depends if model EOL > 0 , EOL = 0
 2023-10-22 18:23:30 +02:00
Robert-Azelis 5ae09b791f
Update AssetsTransformer.php 
on list of assets display EOL rate in months if purchase date and eol date are set, otherwise null (not display anything)
 2023-10-22 18:16:49 +02:00
Robert-Azelis bd195a6911
Update AssetsController.php 
when asset is updated control EOL date change sand set explicit marker depends to setup of model EOL rate
 2023-10-22 18:11:19 +02:00
Robert-Azelis 58062ff9f5
Update AssetModelsController.php 
if EOL of model has been changed and value is >0 assets will be updates with new EOL rate, date
if EOL of model has been changes and value is null or 0 then assets will be updates by null EOL rate, date
*asset with set expilicity market will not be updated
 2023-10-22 17:56:38 +02:00
Robert-Azelis 7571d45d44
[Improvement[ Dashboard 
If multicompany option is enabled much more important for admin is to see on dashboard list of companies instead of locations.  
In other way if multicompanies option is disabled then locations are displayed.
 2023-10-22 17:41:33 +02:00
Robert-Azelis 47186b0abe
[FIX] Custom report - date fields error 
Custom report in v6.2.3 give Error if selected are fields:
Purchase Date, Checkout Date, Last Checkin Date, Expected Checkin Date
Reason is: date field format
 2023-10-22 16:28:44 +02:00
Godfrey M e0a4387b10 clarifies an address column under locations 2023-10-19 10:01:08 -07:00
snipe 38066bf162
Merge pull request #13758 from inietov/fixes/array_to_string_conversion_rb17355 
Fixed ErrorException: Array to String Conversion rb17355
 2023-10-18 19:09:13 +01:00
spencerrlongg 6b745930b5 what typo? 2023-10-18 13:00:13 -05:00
spencerrlongg 38de69b3da new validation rule 2023-10-18 12:41:24 -05:00
snipe bc6f014fff
Merge pull request #13762 from snipe/fixes/make_sure_order_number_is_not_array 
Make sure order number is not an array
 2023-10-18 14:37:18 +01:00
snipe 1be503b21a Make sure order number is not an array 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-18 14:36:16 +01:00
snipe 825c800d32
Merge pull request #13761 from snipe/fixes/check_for_valid_date_in_custom_report 
Check for valid date in custom report
 2023-10-18 14:18:27 +01:00
snipe 0c86b67ed6 Added error reporting to UI 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-18 14:13:35 +01:00
snipe 4d841dbc79 Use custom report validator 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-18 14:13:25 +01:00
snipe f2fb5b43e3 Added custom report validator 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-18 14:12:52 +01:00
snipe 3747165f25
Merge pull request #13759 from snipe/fixes/better_handle_deleted_variables_in_api_call 
Check for true/false explicitly on api table view
 2023-10-18 13:05:57 +01:00
snipe 787a64d313 Check for true/false explicitly on api table view 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-18 13:05:06 +01:00
spencerrlongg f7bb911b99 clean up 2023-10-17 19:06:53 -05:00
spencerrlongg 388e4c10c4 catch custom fields that are arrays 2023-10-17 19:03:58 -05:00
Ivan Nieto Vivanco 74ed32903f Adds condition to check if parameter is of the proper type 2023-10-17 15:48:51 -06:00
snipe f2bc7d6173
Merge pull request #13757 from snipe/fixes/RB-17334_user_formatted_array 
Fixed RB-17334 - ErrorException: Undefined variable $user_formatted_array
 2023-10-17 22:34:52 +01:00
snipe 72fe94edb3 Fixed RB-17334 - ErrorException: Undefined variable $user_formatted_array 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-17 22:33:56 +01:00
snipe 3e54a9d561
Merge pull request #13756 from spencerrlongg/bug/label_logo_fix 
Fixed #13652 - Labels Using Wrong Logo
 2023-10-17 19:45:20 +01:00
spencerrlongg 4bdd070f7b formatting 2023-10-17 13:41:31 -05:00
spencerrlongg 277608d962 this seems to work 2023-10-17 13:30:51 -05:00
snipe 82c2a46ada Commented out noisy debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-16 23:24:03 +01:00
snipe 3f6554ee34 Use singleton for offset 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-16 23:23:43 +01:00
snipe 1e0512ad44
Merge pull request #13753 from snipe/fixes/check_for_valid_location 
Check that the location is valid before debugging
 2023-10-16 23:14:41 +01:00
snipe 23fa92f4ce Check that the location is valid before debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-16 23:13:38 +01:00
snipe 2218cff7bc Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-16 20:18:33 +01:00
snipe b1f158ba5a
Merge pull request #13749 from snipe/bug/sc-23473 
Handle case where value is deleted in history
 2023-10-13 19:58:19 +01:00