DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-15 18:14:09 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
12967 commits 96 branches 267 tags 295 MiB
Commit graph

12967 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
snipe bda6fdf09c
Merge pull request #14395 from snipe/snyk-upgrade-9e465161f7c9fd096a214ca3ad2fae7b 
[Snyk] Upgrade webpack from 5.90.1 to 5.90.2
 2024-03-08 08:44:07 +00:00
snyk-bot a62198f33f
fix: upgrade webpack from 5.90.1 to 5.90.2 
Snyk has created this PR to upgrade webpack from 5.90.1 to 5.90.2.

See this package in npm:
https://www.npmjs.com/package/webpack

See this project in Snyk:
https://app.snyk.io/org/snipe/project/3d53e1dd-b8bf-46b5-ba61-18ce26933166?utm_source=github&utm_medium=referral&page=upgrade-pr
 2024-03-08 06:20:14 +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 78868813b1 Merge remote-tracking branch 'origin/develop' 2024-03-08 01:05:07 +00: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 9ae779e442 Merge remote-tracking branch 'origin/develop' 2024-03-07 23:44:30 +00: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 ea2d54b0f7 Merge remote-tracking branch 'origin/develop' 2024-03-07 21:22:01 +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 55c237913c Merge remote-tracking branch 'origin/develop' 2024-03-07 15:11:33 +00: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 313b327cd7 Bumped hash for master 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-07 11:34:38 +00:00
snipe 855d922a3e Merge remote-tracking branch 'origin/develop' 2024-03-07 11:31:38 +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 21ad7f549d Merge remote-tracking branch 'origin/develop' 2024-03-07 10:34:30 +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 485d40c752 Merge remote-tracking branch 'origin/develop' 2024-03-07 10:30:31 +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 109c0f202a Merge remote-tracking branch 'origin/develop' 2024-03-07 10:19:06 +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 6156d67e4a Merge remote-tracking branch 'origin/develop' 2024-03-07 10:17:05 +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
snipe bd566324ed Updated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-06 20:20:23 +00:00
chandanchowdhury b65bf5082d
Fix #13515: create directories expected by RestoreFromBackup.php 2024-03-06 15:11:41 -05:00
snipe 939e4cba3e Updated prod assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-06 20:05:16 +00:00
snipe 015a8763a0 Merge remote-tracking branch 'origin/develop' 2024-03-06 20:04:48 +00:00
snipe 02862d80eb Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-06 20:04:31 +00:00
snipe 7b0a3fc6d3 Merge remote-tracking branch 'origin/develop' 2024-03-06 20:01:23 +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
Godfrey M feb78d00cf conditionally shows label fields if on old label engine only 2024-03-06 11:25:49 -08:00