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

12903 commits

This branch
This branch
All branches
Author SHA1 Message Date
Godfrey M bf0bd06f20 put important back 2024-03-11 15:56:53 -07:00
Godfrey M f07b0b6bd7 removed important 2024-03-11 15:54:59 -07:00
Godfrey M 717b26c834 fixes z-index of date-picker 2024-03-11 15:53:59 -07:00
snipe 693d1c9452
Merge pull request #14413 from snipe/fixes/deprecation_on_strtoupper 
Fixed deprecation warning on `strtoupper()`
 2024-03-11 14:59:55 +00:00
snipe b049bb1d5c Check for null on select 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-11 14:55:49 +00:00
snipe 1df56a7cab
Merge pull request #14407 from snipe/bug/sc-25019_added_created_at_pivot 
Added created_at to license pivot
 2024-03-10 16:40:56 +00:00
snipe 3f5cc2507d Used updated_at instead 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-10 16:39:49 +00:00
snipe 5a85424295 Added created_at to license pivot 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-10 16:33:04 +00:00
snipe 3fdee881f9
Merge pull request #14404 from snipe/fixes/Uninitialized-string-offset-0-in-labels 
Fixed uninitialized offset in labels in new label engine
 2024-03-10 14:40:12 +00:00
snipe a289dfaf88 Cleanup 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-10 14:33:53 +00:00
snipe cde5502f94 Handle blank labels on asset label fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-10 14:03:21 +00:00
snipe 28ec0b8ebb Removed debugging console lines 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-08 17:19:31 +00:00
snipe 37dfecf098 Fixed uninitialized offset in labels 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-08 16:46:56 +00:00
snipe 07880dfe50
Merge pull request #14400 from snipe/localizations/updated_strings 
Updated language strings, added Somali
 2024-03-08 14:07:32 +00:00
snipe 7eed9f8542 Added Somali 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-08 14:06:21 +00:00
snipe b9aeded957 Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-08 14:01:34 +00:00
snipe ff10d1540f Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-08 10:00:00 +00:00
snipe 22ef569e5e Merge branch 'security/snyc_Upgrade-webpack-from-5.90.1-to-5.90.2_14395' into develop 2024-03-08 08:50:26 +00:00
snipe f3663f0983 [Snyk] Upgrade webpack from 5.90.1 to 5.90.2 #14395 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-08 08:45:49 +00:00
snipe 112ddaf55b
Merge pull request #14394 from marcusmoore/fixes/check-endpoint-is-set-for-checkout-in-notifications 
Ensure Chat and Teams endpoints are not blank before attempting to send webhook on checkout and check in
 2024-03-08 08:44:52 +00:00
Marcus Moore 4b0bfc52b4
Ensure webhook endpoint is set before attempting to send to google or microsoft 2024-03-07 18:10:10 -08:00
snipe e8be178ac7
Merge pull request #14393 from marcusmoore/bug/sc-24862 
Guard against checking require acceptance on non-existent relationship in accessory model
 2024-03-08 01:04:26 +00:00
Marcus Moore 695428cd44
Guard against unrelated category 2024-03-07 16:59:01 -08:00
snipe db92febdc7
Merge pull request #14392 from snipe/fixes/removed_unneeded_starts_with_validation_string 
Removed unneeded validation message
 2024-03-07 23:42:58 +00:00
snipe 5cf10cec34 Remloved unneeded validation message 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-07 23:40:30 +00:00
snipe c66267a0f9
Merge pull request #14389 from Godmartinz/remove-pdf-for-old-labels 
old engine works as intended
 2024-03-07 21:06:57 +00:00
snipe f1d2f24534
Merge pull request #14388 from marcusmoore/bug/sc-25001 
Fixed attempting to run bulk actions on an empty asset collection
 2024-03-07 21:03:45 +00:00
Godfrey M d83974e07f old engine works as intended 2024-03-07 13:03:10 -08:00
Marcus Moore f270f30728
Redirect if no assets are returned from query 2024-03-07 12:30:08 -08:00
snipe 806671df7c
Merge pull request #14385 from snipe/feature/sc-24971_convert_unencrypted_custom_fields 
Added console command to encrypt previously unencrypted fields
 2024-03-07 15:08:19 +00:00
snipe d64ee42ec3 Wrapped in a transaction 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-07 15:04:08 +00:00
snipe fe08f39900 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-07 14:43:06 +00:00
snipe 5123ab57c9 Added console command to encrypt previously unencrypted fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-07 14:40:52 +00:00
snipe cbe07ad23b Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-07 11:30:54 +00:00
snipe b3aba4ad99
Merge pull request #14379 from chandanchowdhury/master 
Fix #13515: Cannot restore backup
 2024-03-07 11:30:06 +00:00
snipe 4b13fa45c5
Merge pull request #14320 from Godmartinz/default_label_bug 
Default label setup with custom fields
 2024-03-07 10:33:43 +00:00
snipe 8346ae8235
Merge pull request #14370 from ubc-cpsc/bugfix/CVE-2024-27354 
Fixes CVE-2024-27354 and CVE-2024-27355 in phpseclib/phpseclib
 2024-03-07 10:28:31 +00:00
snipe 4231058aa1
Merge pull request #14371 from Godmartinz/RB17900_notification_bug 
Adds User email check when sending Asset acceptance reminder
 2024-03-07 10:18:19 +00:00
snipe 58bf036f52
Merge pull request #14380 from Godmartinz/1dbarcode_unselected_bug 
Fixed 1dbarcodes to populate based on settings
 2024-03-07 10:16:37 +00:00
Godfrey M ff7d25c0f2 simplified 1dbarcode logic 2024-03-06 15:30:53 -08:00
Godfrey M 5f0b7f328c if statement order change 2024-03-06 15:24:03 -08:00
Godfrey M 6559581bad conditions 1dbarcode to populate based on settings 2024-03-06 15:10:42 -08:00
Godfrey M d78262f52b resolved merge conflicts 2024-03-06 14:48:47 -08:00
chandanchowdhury b65bf5082d
Fix #13515: create directories expected by RestoreFromBackup.php 2024-03-06 15:11:41 -05:00
snipe 02862d80eb Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-06 20:04:31 +00:00
snipe b40b31b7b1
Merge pull request #14378 from snipe/security/snyk_Upgrade-jspdf-autotable-from-3.8.1-to-3.8.2-14365 
Upgrade jspdf-autotable from 3.8.1 to 3.8.2 #14365
 2024-03-06 19:55:59 +00:00
snipe 149d3d13d1 Upgrade jspdf-autotable from 3.8.1 to 3.8.2 #14365 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-06 19:55:19 +00:00
snipe 0f64d66cd8 Merge remote-tracking branch 'origin/develop' 2024-03-06 19:48:55 +00:00
snipe a85e2f7aad
Merge pull request #14372 from snipe/bug/sc-24158 
Added route parameter
 2024-03-06 19:45:33 +00:00
snipe 4f883b1264
Merge pull request #14375 from Godmartinz/Label-info_fix 
Fixed Labels: bulk actions are handled before sorting
 2024-03-06 19:44:59 +00:00