DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-17 11:04:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
14380 commits 96 branches 267 tags 296 MiB
Commit graph

14380 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Godfrey M c9d54baa10 bulk actions are handled before sorting 2024-03-05 15:47:52 -08:00
Godfrey M 940f54dab1 revert some changes 2024-03-05 15:45:35 -08:00
Godfrey M d83827a44e bulk actions are handled before sorting 2024-03-05 15:43:41 -08:00
spencerrlongg 3a0a13d06d tests written but something not working... 2024-03-05 16:35:06 -06:00
snipe 23f8e35716 Added route parameter 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-05 20:39:56 +00:00
spencerrlongg a251e61d73 rm commented code and add comment 2024-03-05 13:40:44 -06:00
spencerrlongg af06b1cd06 hide encryption option for checkbox and radio 2024-03-05 13:37:30 -06:00
Brady Wetherington 5b9120ba6c Merge branch 'develop' into snipeit_v7_laravel10 2024-03-05 19:22:37 +00:00
snipe 7769a93a10 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-05 19:07:40 +00:00
snipe 95a6c7058f Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-05 19:06:55 +00:00
Godfrey M 6c3a668400 checks to see if a user has an email before sending them a reminder email. 2024-03-05 10:30:24 -08:00
spencerrlongg ad0f873ece rm validation stuff 2024-03-05 11:58:00 -06:00
Joël Pittet 3008a4ed7a Fixes CVE-2024-27354 and CVE-2024-27355 2024-03-05 09:55:56 -08:00
Godfrey M 95ef3a336b Merge branch 'develop' into default_label_bug 2024-03-04 12:03:54 -08:00
snipe 9a5c1b8126
Merge pull request #14362 from Godmartinz/labels-not-generating-properly 
Fixes inconsistencies with generating labels
 2024-03-04 18:49:44 +00:00
Godfrey M e926db76a0 fixes inconsistencies with generating labels 2024-03-04 10:26:38 -08:00
snipe 9419c7fdeb Fixed contributing link 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-01 12:42:26 +00:00
snipe 9dbb4abe7e Fixed tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-01 12:30:05 +00:00
snipe 19e0fb7955 Reverting CSP change 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-01 12:25:14 +00:00
snipe 5b9b21a7d1
Merge pull request #14357 from snipe/fixes/stricter_csp_rules 
Removed unsafe-inline and unsafe-eval
 2024-03-01 11:48:51 +00:00
snipe 93e69ab0c6 Removed unsafe-inline and unsafe-eval 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-01 11:44:49 +00:00
snipe bc5c559413
Merge pull request #14356 from snipe/fixes/set_csp_rule_to_true_by_default 
Set CSP headers to true by default
 2024-03-01 11:37:53 +00:00
snipe 9b2fcbff08 Set CSP headers to true by default 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-01 11:36:37 +00:00
snipe ad2674d20b
Merge pull request #14355 from snipe/localization/new_strings 
Updated language strings
 2024-03-01 11:18:12 +00:00
snipe 10ac2c830f Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-01 11:17:02 +00:00
snipe df3053eafb
Merge pull request #14354 from snipe/bug/sc-24911 
Use SVG cleaner on favicons
 2024-03-01 10:19:59 +00:00
snipe aaae952acb Use SVG cleaner on favicons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-01 10:17:57 +00:00
Jeremy Price 8ace30ee23 Update mailer configurations for Symfony mailer 
Newer Laravel uses Symfony mailer instead of SwiftMailer, and that means
that some configs and functionality have changed

In this change, we update config/mail.php with the new config layout and
name/functionality changes

of note:

* New configuration layout supporting lots of new/different mailers
* MAIL_DRIVER has become MAIL_MAILER, though we'll support both
* MAIL_ENCRYPTION is mostly useless, and we mark it as such -- symfony
  mailer detects which type of encryption to use automagically.
* MAIL_TLS_VERIFY_PEER is now available in case of self-signed
  certificates on the mail server, of if you want to access it by a
  different name, or by IP

Accordingly, we also update the .env examples, docker configs, and
the .env builder in the snipeit.sh installation script with the above
changes
 2024-02-28 23:37:52 -08:00