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

6661 commits

Author SHA1 Message Date
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
spencerrlongg
d949a9689f fix all 2025-02-24 22:35:47 -06:00
snipe
134045f1ec Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2025-02-24 23:46:55 +00:00
snipe
b6b6a3eec7 Remove req for 0 min 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-24 23:46:50 +00:00
snipe
b62714d702
Merge pull request #16062 from snipe/remove_mcrypt 
Removed references to mcrypt
 2025-02-24 23:22:32 +00:00
Jesse Ostrander
6a8a41b389
fix: reference to item location on location edit method 2025-02-24 17:34:18 -05:00
snipe
4800f4c853
Merge branch 'develop' into remove_mcrypt 2025-02-24 22:12:56 +00:00
snipe
bf2355a297 Fixed showfile path 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-24 14:34:10 +00:00
snipe
2bf4ec0ae8 A few more small tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-24 14:24:15 +00:00
snipe
77b417bcea Passed user to showfile 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-24 13:43:39 +00:00
snipe
a5009aa7df Added withTrashed() to handle soft deletes with RMB 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-24 13:38:06 +00:00
snipe
e589adbe80 Updated model route 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-24 13:31:09 +00:00
snipe
dd2b570db5 Added tighter constraints on deleting components 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-23 14:11:39 +00:00
snipe
069860d65f Added tooltip for currency in table 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-23 12:19:18 +00:00
snipe
9abf3029ef Compact the method just a little 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 19:02:41 +00:00
snipe
19fb45f488 Refactor into method 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 18:57:18 +00:00
snipe
f5eedb8d23 Added RMB and include $item so the asset fields are populated 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 18:13:12 +00:00
snipe
172df0d220 Save new custom field values 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 18:12:46 +00:00
snipe
c611cb5612 Updated loggable to check for custom fields that were passed for meta 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 18:12:30 +00:00
snipe
bb70250007 Added select/unselect tooltip to presenters, added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 14:30:49 +00:00
snipe
346aeeda71
Merge pull request #16287 from uberbrady/better_hover_titles 
Fixes: [sc-28423] Better tooltips on lists, Bootstrap style
 2025-02-22 14:24:02 +00:00
snipe
0cd0abe8bb Fixed #16282 - adds accessories tab to assets 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 14:20:21 +00:00
snipe
7db11dc12b
Merge pull request #16277 from Godmartinz/bulk_delete_asset_bug 
Fixes deletion of assigned assets through bulk delete
 2025-02-22 12:59:37 +00:00
snipe
e0221301ff Increased text limit on notes 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 12:56:25 +00:00
snipe
b0fa059a28
Merge pull request #16285 from marcusmoore/bug/sc-28148 
Re-added ability to add notes to assets
 2025-02-22 12:55:18 +00:00
snipe
7a77de6ffe Don’t delete avatar file on soft-delete 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 12:49:04 +00:00
snipe
d1cc0fcfac Added ability to send user inventory via bulk UI 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 12:07:54 +00:00
snipe
7b930357e4 Cast years to int 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 10:51:27 +00:00
Brady Wetherington
2d1e9b237f Better tooltips on list views, in Bootstrap style 2025-02-21 13:23:19 +00:00
Brady Wetherington
38c5f23a52 Merge branch 'v8' into develop 2025-02-21 11:15:44 +00:00
Marcus Moore
ae7d7f7d22
Merge branch 'develop' into bug/sc-28148 
# Conflicts:
#	routes/web.php
 2025-02-20 13:23:55 -08:00
Marcus Moore
43f679a554
Revert some changes from #15525 2025-02-20 12:59:16 -08:00
Marcus Moore
f1bf9fcf5c
Implement test 2025-02-20 12:51:08 -08:00
Marcus Moore
992b4c7d86
Remove old comment 2025-02-20 12:50:03 -08:00
Marcus Moore
44503fc423
Use translation 2025-02-20 12:41:56 -08:00
snipe
5b63eb5a15
Merge pull request #16272 from snipe/experiments/breadcrumbs 
Experimental WIP - added breadcrumbs, route model binding for resource routes
 2025-02-20 19:21:58 +00:00
snipe
e0beed0fa3 Reapplied accessory gate 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-20 18:28:01 +00:00
snipe
d4b24e5e57 Exception handler exceptions - exception inception! 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-20 18:27:45 +00:00
snipe
44a7bdbfb5 Moved SAML gui settings routes to web.php 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-20 14:58:17 +00:00
snipe
0341335d14 Additional crombs 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-20 14:57:48 +00:00
snipe
76f038d142 RMB for custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-20 14:57:18 +00:00
snipe
3150ad50c9 RMB for audits 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-20 14:57:07 +00:00
snipe
80394ef788 Revert delete because route model binding + resources routes + soft deletes = sux0r 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-20 12:29:37 +00:00
snipe
8a70f09dd3 Temp “fix” RMB for soft-deleted users 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-20 12:19:31 +00:00
Godfrey M
a275391557 adds test for deleting assigned asset 2025-02-19 15:59:57 -08:00
Godfrey M
eaacf29d57 fix tests 2025-02-19 15:11:16 -08:00
Marcus Moore
759c8c8f5c
Catch TypeError in addition to Exceptions when rendering barcodes 2025-02-19 12:36:50 -08:00
snipe
6242296930 Remove the “View” part of the breadcrumb 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 19:30:13 +00:00
snipe
d330ef9919 Added crumbs and RMB for custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 18:23:16 +00:00