ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,184 Commits 84 Branches 293 Tags
8a44144c2040adc0b4de2793c8a33cf4fa5f1c19
Commit Graph

7026 Commits

Author SHA1 Message Date
Brady Wetherington 28e2e7c924 Get rid of more editorialization 2025-05-16 10:57:34 +02:00
Brady Wetherington 97351028b5 Get rid of editorializing in comments 2025-05-16 10:56:36 +02:00
Brady Wetherington 0ef0863b59 Make checkin emails not send unless the send-emails attribute is set on the category 2025-05-16 10:48:17 +02:00
snipe ca66e29072 Merge pull request #16946 from marcusmoore/bug/sc-29166 
Gracefully handle error when editing of soft deleted users
 2025-05-15 22:46:48 +02:00
Marcus Moore 9600adee6b Don't allow viewing edit page if user soft deleted 2025-05-15 11:14:15 -07:00
snipe 6eb3819492 Apply correct unique custom field validation for audit API 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-15 18:31:49 +02:00
snipe 95226f87bc Use same logic for auditStore for validating unique fields 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-15 18:02:23 +02:00
Marcus Moore d3a74a5740 Use route bound user instead of re-querying 2025-05-14 12:46:34 -07:00
snipe b06fd5bbca Merge pull request #16942 from uberbrady/quick_temp_fix_notifications 
A quick check to make sure that webhooks still fire when email is off
 2025-05-14 16:21:37 +02:00
Brady Wetherington 6306f78fe0 A quick check to make sure that webhooks still fire when email is off 2025-05-14 16:14:03 +02:00
snipe ab1053ecda Merge pull request #16916 from marcusmoore/bug/sc-29153 
Handle potential hard exception in Asset@getImageUrl method
 2025-05-14 14:52:33 +02:00
Marcus Moore e2772c816d Remove label logo outline from L7162_B label 2025-05-12 13:58:13 -07:00
Marcus Moore 73057454c6 Fix bug in getImageUrl method 2025-05-12 11:56:40 -07:00
snipe 9e3e04521e Merge pull request #16900 from marcusmoore/fixes/user-full-name-accessor 
Handle settings not being available in full name accessor
 2025-05-10 12:26:19 +01:00
snipe 9b91584776 Added models to deletable check 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-09 19:17:48 +01:00
snipe 556e1081b3 Added two more selectors for byod 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-09 17:23:08 +01:00
snipe bafff9020a Merge pull request #16611 from Godmartinz/MS_teams_deprecation_update 
Reworked MS Teams deprecation warnings and notifications visibility
 2025-05-09 16:38:25 +01:00
snipe 0d5dca6456 Fixed #16690 - fallback to category image if no model image is present 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-09 14:46:27 +01:00
Marcus Moore d57f56e44f Handle settings not being available 2025-05-08 16:20:26 -07:00
snipe 13521bcf75 Removed seat “name” from license seats API/UI 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-08 17:37:27 +01:00
snipe 1c09dc139a Undo previous change 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-08 16:40:24 +01:00
snipe d5f955b1e0 License seats are not numbered correctly [sc-29113] 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-08 16:25:49 +01:00
snipe 0b167f5f6f Grab location uploads from backup 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-08 15:22:26 +01:00
snipe 1881054c92 Fixed #16863 - better handle unique not required custom field redirects 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-08 15:00:43 +01:00
snipe f181e0fa55 Merge pull request #16877 from marcusmoore/bug/sc-29012 
Allow updating asset model image via api
 2025-05-08 06:27:49 +01:00
snipe b04efdfefc Merge pull request #16889 from grokability/add_updated_range_to_custom_report 
Added #16887 - last updated date range for custom report
 2025-05-08 06:27:32 +01:00
snipe 352b935dee Merge pull request #16884 from marcusmoore/bug/sc-29097 
Removed `2fa_authed` from session upon logout
 2025-05-08 06:23:26 +01:00
snipe 0ba3b9975a Added #16887 - last updated date range for custom report 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-08 06:21:06 +01:00
Marcus Moore cc06187f31 Remove 2fa_authed from session upon logout 2025-05-07 14:04:33 -07:00
snipe a916767392 Show the QR code on the asset page regardless of label settings 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-07 11:34:21 +01:00
Marcus Moore d75de73867 Allow updating asset model image via api 2025-05-06 17:13:23 -07:00
snipe 3a4fa35398 Merge pull request #16874 from grokability/clone_breadcrumb_fix 
Fixed breadcrumbs for cloning
 2025-05-06 16:42:52 +01:00
snipe 45ff195f11 Fixed breadcrumbs for cloning 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-06 16:17:02 +01:00
snipe 5c11a8c1e0 Modified helper 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-06 16:12:06 +01:00
Nathan Taylor d4b73b4fb9 Avoids potential error when alerts table is empty 
Updates the Kernel to use the null-safe operator
when accessing the alerts_enabled setting. This prevents
a potential error if the settings object is null.
 2025-05-06 09:47:33 +10:00
snipe a67b320cae Merge pull request #15907 from uberbrady/protect_assigned_to_assigned_type_rebased 
Rebased version of #15629 - prevent setting assigned_to without setting assigned_type
 2025-05-05 20:42:46 +01:00
Godfrey M 3b34654dd7 Merge branch 'develop' into MS_teams_deprecation_update 
# Conflicts:
#	resources/lang/en-US/admin/settings/message.php
 2025-05-05 09:33:32 -07:00
Godfrey M 4b6437854c swapped out hard coded text with translation 2025-05-05 09:31:23 -07:00
Calvin Schwartz cfd10ae294 adds support for Avery 3490 2025-05-05 14:59:10 +01:00
snipe 407962d998 Merge pull request #16790 from Godmartinz/empty_field_columns_labels 
Adds Label fields offset as an option
 2025-05-05 14:09:40 +01:00
snipe 83d6e9ad8a Removed log error 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-05 14:00:05 +01:00
snipe 4469db0bd3 Livewire component for smoother check for location companies 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-05 13:55:28 +01:00
snipe a0358e32d7 Removed escaping 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-30 16:46:06 +01:00
snipe c2023c5c56 Ampersand showing in Custom fields [sc-29051] 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-30 16:25:44 +01:00
snipe 43c310c82d Merge pull request #16531 from akemidx/bug/sc-28715 
FIXED: Purchase Cost Column Always Shown
 2025-04-30 15:54:31 +01:00
snipe 939a0c44dc Merge pull request #16826 from Godmartinz/fix_multiple_inline_label_field_options 
Reworked fix for for 24mm_D label indent errror
 2025-04-30 15:47:57 +01:00
snipe 0a29e90701 Smal improvements to scoping displays 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-30 15:24:42 +01:00
snipe 0dcaa83a3e Nicer breadcrumb 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-30 14:22:13 +01:00
snipe 340f8b73a5 Updated comments 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-30 13:56:37 +01:00
snipe 6c6b37000a Better handle permissions with bad data 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-30 13:43:05 +01:00