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
11800 commits 97 branches 266 tags 292 MiB
Commit graph

11800 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 4f136920a9 Merge remote-tracking branch 'origin/develop' 2023-10-24 17:03:50 +01: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 ec878202f7 Merge remote-tracking branch 'origin/develop' 2023-10-24 11:53:00 +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
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 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
snipe bcce282ef9 Merge remote-tracking branch 'origin/develop' 2023-10-18 19:16:55 +01: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 41e96ad0ab Merge remote-tracking branch 'origin/develop' 2023-10-18 14:37:37 +01: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 997664f489 Merge remote-tracking branch 'origin/develop' 2023-10-18 14:18:49 +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 14a0c9b5db Merge remote-tracking branch 'origin/develop' 2023-10-18 13:06:21 +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 a6d3886aaf Merge remote-tracking branch 'origin/develop' 2023-10-17 22:37:50 +01: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 73ec84903e Merge remote-tracking branch 'origin/develop' 2023-10-16 23:15:05 +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 55d0c4021d Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-10-16 20:19:03 +01:00
snipe 2218cff7bc Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-16 20:18:33 +01:00
snipe 8c4bf74f93 Commented out noisy debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-14 20:43:18 +01:00
snipe 4e3d5707ce Use singleton for offset 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-14 20:39:52 +01:00
snipe 37858d870a Merge remote-tracking branch 'origin/develop' 2023-10-13 19:58:37 +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
snipe a92a9d7616 Removed duplicated deleted 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-13 19:53:11 +01:00
snipe 8f23a45cb3 Removed dummy text 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-13 19:49:03 +01:00
snipe 93cccf4f5f Handle case where value is deleted in history 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-13 19:32:09 +01:00
snipe dcdc294135 Merge remote-tracking branch 'origin/develop' 2023-10-13 12:40:30 +01:00
snipe 04f6f39588
Merge pull request #13748 from snipe/bug/sc-23830 
Fixed #13723 - race condition on asset observer for older migration
 2023-10-13 12:40:14 +01:00