lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
17061 commits 1 branch 0 tags 220 MiB
Commit graph

17061 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe
115bb94704
Merge pull request #16156 from marcusmoore/acceptance-reminder-subject 
Added "Reminder" to subject line of follow up asset checkout emails
 2025-02-27 14:55:59 +00:00
snipe
b8799f8038 Bumped bash 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-27 12:21:28 +00:00
snipe
dc619bb0dc
Merge pull request #16365 from marcusmoore/chore/migrate-checkbox-helpers-pt6 
Replace calls to Form::checkbox pt6
 2025-02-26 23:54:50 +00:00
Marcus Moore
af6d9e4a00
Replace Form::checkbox on custom report pages 2025-02-26 15:15:48 -08:00
snipe
8c8af3062e
Merge pull request #16354 from snipe/dont_checkin_for_pending_on_asset_update 
Allow pending as an asset status type that does not automatically check the asset in
 2025-02-26 21:05:11 +00:00
snipe
2ff47edb94
Merge pull request #16361 from Godmartinz/acceptancer_reminder_unlisted_email_info 
Fixed acceptance reminder command lag on users with no associated email
 2025-02-26 20:33:02 +00:00
snipe
d923d29bad
Merge pull request #16360 from spencerrlongg/bug/sc-28537 
Add Safety Around Bulk Status Update
 2025-02-26 20:32:19 +00:00
Godfrey M
899119ae2d changes output to a table 2025-02-26 12:30:19 -08:00
snipe
e031de8e49
Merge pull request #16363 from snipe/added_a_few_more_no_interaction_calls 
Added `--no-interaction` to additional passport commands
 2025-02-26 20:19:37 +00:00
snipe
a81c520d93 Follow up for #16341 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-26 20:15:09 +00:00
Godfrey M
8352e81228 fix unaccepted reminder test 2025-02-26 11:50:08 -08:00
Godfrey M
fd0174ff32 remove unwanted changes to livewire 2025-02-26 11:31:41 -08:00
Godfrey M
cc26aa02b2 fix acceptance reminder command no email list 2025-02-26 11:25:21 -08:00
snipe
616f3558dd Update example env 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-26 19:14:25 +00:00
spencerrlongg
d6e266cec1 make super safe 2025-02-26 13:11:49 -06:00
snipe
31516d7f24
Merge pull request #16356 from snipe/added_fields_for_model_search 
Added name, model_number and notes for strict search
 2025-02-26 12:46:13 +00:00
snipe
e79af255aa Added name, model_number and notes for strict search 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-26 12:43:54 +00:00
snipe
5b0d7f4064 One more chonk 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-26 12:01:50 +00:00
snipe
2f6af10c5d Bumped chunk for custom report 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-26 11:59:34 +00:00
snipe
afabda9235 Remove greater than 0 for alert threshold - fixes FD-47040 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-26 11:38:33 +00:00
snipe
1618c9ae8e Changed confirmation message 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-26 10:53:41 +00:00
snipe
5344ef4a1a Allow pending as an asset status that does not automatically check the asset in 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-26 10:46:38 +00:00
snipe
16420b1e00 Audit Log Number under Days to next Audit [sc-28530] 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-26 10:25:07 +00:00
snipe
62f66e724e Drop errors to warnings to stop pooping on rollbar 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-26 09:54:13 +00:00
snipe
9b0ea51d35 Moved composer clear commands to after composer install per #16334 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-26 09:37:31 +00:00
snipe
992214fc66 Check for adminuser withTrashed 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-26 08:25:22 +00:00
snipe
93dab12461
Merge pull request #16342 from snipe/nicer_upgrade_script 
Nicer upgrade.php UI
 2025-02-26 07:16:28 +00:00
snipe
ea0f105180
Merge pull request #16347 from marcusmoore/chore/migrate-checkbox-helpers-pt4 
Replace calls to Form::checkbox pt4
 2025-02-26 07:05:38 +00:00
snipe
5b6da0c1e8
Merge pull request #16348 from marcusmoore/chore/migrate-checkbox-helpers-pt5 
Replace calls to Form::checkbox pt5
 2025-02-26 07:05:22 +00:00
snipe
4d7655bbe1
Merge pull request #16346 from marcusmoore/chore/migrate-checkbox-helpers-pt3 
Replace calls to Form::checkbox pt3
 2025-02-26 07:04:27 +00:00
snipe
5e3855ee5b
Merge pull request #16345 from marcusmoore/fixes/update-custom-fields 
Fixed renaming custom fields
 2025-02-26 07:03:40 +00:00
Marcus Moore
e01226a174
Replace Form::checkbox on saml settings page 2025-02-25 17:31:05 -08:00
Marcus Moore
f9ccf32af4
Replace Form::checkbox on ldap settings page 2025-02-25 17:22:44 -08:00
Marcus Moore
2c5170a218
Replace Form::checkbox on security settings page 2025-02-25 17:09:25 -08:00
Marcus Moore
15f842e2dc
Replace Form::checkbox on bulk user edit page 2025-02-25 16:00:46 -08:00
Marcus Moore
46b31dfe14
Replace Form::checkbox on user create and edit page 2025-02-25 14:32:39 -08:00
Marcus Moore
d88c79366c
Replace Form::checkbox on google settings page 2025-02-25 14:27:07 -08:00
Marcus Moore
de330a47cd
Replace Form::checkbox on asset tag settings page 2025-02-25 14:25:02 -08:00
Marcus Moore
ecd7dc2094
Replace Form::checkbox on alert settings page 2025-02-25 14:23:26 -08:00
Marcus Moore
510946e0eb
Replace Form::checkbox in logo upload partial 2025-02-25 14:20:43 -08:00
Marcus Moore
37e4a13979
Replace Form::checkbox in image upload partial 2025-02-25 14:15:12 -08:00
Marcus Moore
c73d64cdbc
Remove manual doctrine mapping for enums 2025-02-25 13:37:23 -08:00
snipe
4a0410d969 Uncomment git stash 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-25 16:55:39 +00:00
snipe
668b9f8fb9 Nicer upgrade.php UI 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-25 16:51:32 +00:00
snipe
037d2d9e84
Merge pull request #16341 from uberbrady/fix_passport_install_no_interaction 
Fixes #16331 - Don't make passport:install command require user input
 2025-02-25 16:43:49 +00:00
Brady Wetherington
bce2007b97 Fixes #16331 - Don't make passport:install command require user input 2025-02-25 16:38:40 +00:00
Brady Wetherington
09a5e5b1bd Whoops! Need minimum 8.2, not 8.1 (probably mis-merge?) 2025-02-25 14:40:45 +00:00
snipe
7b4f4b6b7f
Merge pull request #16337 from joakimbergros/develop 
Fixed #16173: `useraccountcontrol` was not included in the ldap query attributes
 2025-02-25 13:49:38 +00:00
Joakim Bergros
5c66334017 Added a check to see if the user has specified that is an ActiveDirectory server in the configuration before adding the useraccountcontrol attribute to the ldap query. 2025-02-25 14:22:22 +01:00
Joakim Bergros
ae82051b73 Fixed #16173: useraccountcontrol was not included in the ldap query attributes. 
`$results` did not include the `useraccountcontrol` and thus rendered the fallback logic void when `active_flag` was blank.

 Added a condition to check if `active_flag` is blank and only then add `useraccountcontrol` to the ldap query since it is then a requirement in accordance with "we respect the userAccountControl attribute" text in the `admin/ldap` route.

[`elseif' will become true when `active_flag` is blank](b141945add/app/Console/Commands/LdapSync.php (L364))
 2025-02-25 13:55:53 +01:00