ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,936 Commits 84 Branches 293 Tags
dockerhub-testing
Commit Graph

3544 Commits

Author SHA1 Message Date
Glukose1 d8df52cc8f Implemented setting to specify the amount of days before an assets appers in the due for checkin page. Currently this uses the audit warning days but a sperated setting gives the possibility of defineing different values for each field. 2024-08-15 12:20:51 +02:00
snipe d8038ac483 Removed status label list 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-15 10:17:08 +01:00
snipe 01c69c8f8f Allow optional status label on quickscan checkin 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-15 10:08:48 +01:00
spencerrlongg f031309f8f set up api controller for route/model binding 2024-08-14 16:09:15 -05:00
spencerrlongg 20ec420ba3 not quite done, api side needs some work 2024-08-14 13:53:29 -05:00
spencerrlongg a70b94e707 Merge branch 'refs/heads/develop' into bug/sc-26584 2024-08-14 11:36:19 -05:00
Brady Wetherington cc5ad456e6 Expose the 'sanitize' system for backup restores to the web GUI 2024-08-14 15:59:21 +01:00
snipe 371afde52d Bulk edit asset name 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-14 09:52:25 +01:00
spencerrlongg 120cfd13c5 translation 2024-08-13 14:07:40 -05:00
spencerrlongg 09f2739298 works, un-reassignable licenses are an issue 2024-08-13 13:45:41 -05:00
snipe e9fc455a30 Merge pull request #15192 from Godmartinz/status_labels_check_emails 
Added status labels to confirmation emails
 2024-08-13 18:24:15 +01:00
Brady Wetherington 4b96721393 Attempt to de-escalate SAML login and logout errors 2024-08-13 14:55:13 +01:00
spencerrlongg ec863df007 rm conditional that might be unnecessary 2024-08-12 16:58:53 -05:00
spencerrlongg cc3b8e0681 this should more or less work, but i need to determine if this is the best way 2024-08-12 16:58:21 -05:00
spencerrlongg ff145abbe7 use array for eager loading, makes ide prettier 2024-08-12 16:13:03 -05:00
snipe ac1543d568 Fixed #15247 - make pie chart on dashboard respect the “show archived” setting 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-12 17:54:42 +01:00
snipe ce5be8ac24 Merge pull request #15100 from Godmartinz/depreciation_percentage 
Added Depreciation Percentage as an option
 2024-08-12 10:10:25 +01:00
snipe a1ce9b9285 Added query scope for ordering by admin 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-10 17:00:50 +01:00
snipe f76fbe75e0 Merge pull request #15221 from marcusmoore/fixes/bulk-checkin-logging 
Fixed accessories and consumables not being logged correctly during bulk check-in
 2024-08-08 10:43:59 +01:00
Marcus Moore d03baa4613 Make diff cleaner 2024-08-07 13:29:45 -07:00
Marcus Moore 41437e4d8f Merge branch 'develop' into fixes/bulk-checkin-logging 
# Conflicts:
#	app/Http/Controllers/Users/BulkUsersController.php
 2024-08-07 13:06:59 -07:00
snipe 7d220dd8c2 set default 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-07 20:58:04 +01:00
snipe a99ec062e6 Added checkbox for preferences 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-07 20:49:07 +01:00
snipe 9350a20189 Include accessories count 
This isn’t exactly right right now

Signed-off-by: snipe <snipe@snipe.net>
 2024-08-07 20:19:47 +01:00
snipe 889d5da71e Check for accessories on bulk items 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-07 20:04:32 +01:00
snipe 5546ab08c2 Only delete user records in accessories_checkouts for bulk delete 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-07 19:53:18 +01:00
snipe ef183f256c Merge pull request #15242 from Godmartinz/shortcut_option 
Fixed shortcuts to be optional now
 2024-08-07 18:56:27 +01:00
Godfrey M 6b1784f2ee makes shortcuts optional 2024-08-07 10:47:16 -07:00
snipe a5f075548a Default to user 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-07 18:04:39 +01:00
Marcus Moore c7ddabcc8b Check for FMCS when checking out component 2024-08-06 12:27:15 -07:00
Marcus Moore f2b78d18a4 Merge branch 'develop' into fixes/bulk-checkin-logging 
# Conflicts:
#	app/Http/Controllers/Users/BulkUsersController.php
 2024-08-05 17:25:54 -07:00
Marcus Moore 17eccfcd8b Formatting 2024-08-05 16:58:27 -07:00
Marcus Moore 01e4382d20 Formatting 2024-08-05 16:58:17 -07:00
Marcus Moore 1c664af326 Remove todo outside of scope 2024-08-05 16:58:08 -07:00
Marcus Moore 392d34422a Remove code handled by ConsumableAssignment:: call above 2024-08-05 16:57:40 -07:00
Marcus Moore 67b3ab820f Add todo comments 2024-08-05 16:10:08 -07:00
Marcus Moore bfebcdc7ed Improve variable name 2024-08-05 15:22:35 -07:00
Florent Bervas ad794248fe add a warning message if asset tag not found 2024-08-05 13:54:33 +00:00
Florent Bervas b804791ff6 feature: extend search capabilities to other assets attributes 2024-08-05 12:26:29 +00:00
Godfrey M 854903805b one more spot 2024-07-31 12:16:41 -07:00
Godfrey M b6cac4baae corrects ? usage 2024-07-31 12:03:36 -07:00
spencerrlongg 437ddc01b4 removed extraneous $request->validate() arguments 2024-07-30 16:26:24 -05:00
arne-kroeger e8d0147075 Adjusted missing down on migration and code smells 2024-07-29 19:04:10 +02:00
arne-kroeger b18baf74d2 added options to checkout accessoires to locations and assets 
Added #14979: add checkout functionality to accessoires
 2024-07-29 10:54:53 +02:00
snipe aab29fbb6b Use translated string for restore 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 16:47:40 +01:00
snipe e4a82edd3f Merge pull request #15172 from snipe/features/blade_component_for_submit 
Use blade component for submit redirect on asset edit/create
 2024-07-26 15:13:30 +01:00
snipe ff100c0b9f Added more tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 14:58:10 +01:00
snipe 037cc4d098 More tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 14:27:07 +01:00
snipe cd7f276c40 Fixed logging for component 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 13:09:21 +01:00
snipe 5d7f1f77a3 Added redirect to checkin/checkout controllers 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 12:48:07 +01:00