ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,487 Commits 84 Branches 293 Tags
51ce570eb3b7c5ba714bdaa6e1f6edd505fc85be
Commit Graph

168 Commits

Author SHA1 Message Date
Godfrey M e652a7fd61 fix tests 2025-09-08 14:56:15 -07:00
snipe f340390fc8 Merge pull request #17703 from marcusmoore/17369-accessory-checkout-qty-scaffold 
Fixed issues around accessory acceptance
 2025-09-08 09:09:26 +01:00
snipe c5bede8594 More small display_name fixes 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-04 17:15:06 +01:00
Marcus Moore d29e09a3ff Merge branch 'develop' into 17369-accessory-checkout-qty-scaffold 
# Conflicts:
#	resources/views/account/accept/create.blade.php
#	resources/views/account/accept/index.blade.php
 2025-09-03 12:26:43 -07:00
Godfrey M cd2e7ee31d fix google and slack notifications 2025-09-02 10:53:42 -07:00
Godfrey M c3a0a0415a fix MS Teams Notifications 2025-09-02 10:48:02 -07:00
Godfrey M eadce51f10 fixes check in check out translations for assets in notiications 2025-08-29 11:12:05 -07:00
snipe 28abeab31d Fixed a few more display_name instances 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-29 10:06:58 +01:00
Marcus Moore 4298aad008 Merge branch 'develop' into 17369-accessory-checkout-qty-scaffold 
# Conflicts:
#	app/Http/Controllers/Account/AcceptanceController.php
#	resources/views/notifications/markdown/asset-acceptance.blade.php
 2025-08-26 11:39:52 -07:00
snipe a6b74d56c6 Merge pull request #17709 from grokability/add-display-name-to-users-fixed 
Added display name to users for LDAP/SCIM, added new sync fields (replaced #17650)
 2025-08-26 12:39:25 +01:00
Godfrey M dd742a2e4a add a check for audit notification variables in MS Teams and a translation 2025-08-25 15:10:41 -07:00
snipe b6d397bcca Updated ->present()->fullName() to ->display_name 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-25 14:57:34 +01:00
Marcus Moore 7c58bfa282 Add qty to AcceptanceAssetDeclinedNotification 2025-08-21 14:56:24 -07:00
Marcus Moore 0caaba156d Add qty to AcceptanceAssetAcceptedNotification 2025-08-21 14:54:43 -07:00
Marcus Moore c22575812d Add qty to AcceptanceAssetAcceptedToUserNotification 2025-08-21 14:53:00 -07:00
Godfrey M fe3d225cfa fix tests 2025-08-14 09:15:19 -07:00
Godfrey M dfe2a75d72 adds user that checked out item to acceptance emails 2025-08-12 15:34:46 -07:00
snipe 9dd4bc5fa8 Merge pull request #17391 from Godmartinz/add-components-notifications 
FIXED: #13844 Adds Webhook and Mail Notifications for Components
 2025-07-21 11:51:30 +01:00
snipe fd8f90cb52 Added new password broker for longer toekn lifetime 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-16 16:23:11 +01:00
snipe af7425d8e6 Remove unused variable 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-15 14:19:12 +01:00
snipe 3a97c27350 Removed logging 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-15 14:13:29 +01:00
snipe a85ec6efb3 Set token in welcome email constructor 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-15 14:12:42 +01:00
Godfrey M 3bbd0fdbcd google notifications fires properly 2025-07-09 17:02:51 -07:00
Godfrey M 8214b11da5 MS teams fires properly 2025-07-09 11:44:53 -07:00
Godfrey M 36090bf83e checked in notification fires, updated icon translation usage 2025-07-09 11:35:24 -07:00
Godfrey M bffb2fe82f checkout notification fires 2025-07-09 11:23:27 -07:00
Godfrey M 500cbf5d92 add component checkout notification, update checkout blade, update listener 2025-07-09 11:12:18 -07:00
snipe 59de77feb0 Use company name if provided instead of site name 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-07 15:55:40 +01:00
snipe 8e38b3898e Fixes #14295 - allow user to receive an email PDF upon signing 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-07 15:38:36 +01:00
Godfrey M 3aa4814342 allow dynamic assignment to audit notifications 2025-05-19 11:08:03 -07:00
snipe ad6352adc4 Fixed #15035 - adds company to slack message 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-18 00:28:37 +01:00
Godfrey M 15a09e5187 adds audit notification for MS Teams 2025-03-04 11:15:03 -08:00
Godfrey M f41583fd59 adds ternary checks on locations before pulling names in notifications 2025-02-06 11:34:14 -08:00
Godfrey M 5120cddda4 delete notification version of reminder 2024-12-05 16:02:55 -08:00
Godfrey M 702621ec57 replace the via channel class 2024-11-14 08:38:18 -08:00
Marcus Moore ac3ae651b1 Remove incorrect typehint 2024-11-13 14:15:43 -08:00
Godfrey M 0d707a1851 fixes notifications for licenses and asset to asset checkouables 2024-11-04 15:13:10 -08:00
Godfrey M d6ba303f39 Merge branch 'develop' into refacto_ms_teams_notifs 
# Conflicts:
#	app/Listeners/CheckoutableListener.php
 2024-10-30 10:27:45 -07:00
Godfrey M e7c4343c90 readd checkin accessory format 2024-10-28 14:56:48 -07:00
Godfrey M c0620c27ff adds back laravels channel formats 2024-10-28 14:30:34 -07:00
Godfrey M 6f0c1b12b1 this adds check out message for consumables 2024-10-24 15:04:54 -07:00
Godfrey M 278bc5e52a ads check in and checkout message for license seats 2024-10-24 14:59:10 -07:00
Godfrey M cce75a8185 adds check in and checkout messag for accessories 2024-10-24 14:48:23 -07:00
Godfrey M e27ff13377 adds check in and checkout message for assets 2024-10-24 14:39:40 -07:00
Godfrey M 18da80e6de fix checkoutable listener for microsoft teams 2024-10-24 14:24:00 -07:00
Godfrey M 18760e3fa1 replaces teams notification package, passes integration test 2024-10-24 12:21:51 -07:00
Godfrey M ab3b9c4510 remove unnecessary code from checkinasset notification 2024-10-23 16:24:01 -07:00
Godfrey M 2cc2b2b1df apply array_filter to cc emails to prevent errors 2024-10-23 16:06:27 -07:00
Godfrey M fd74c35102 remove old notify by mail from consumable notification 2024-10-23 15:08:29 -07:00
snipe 0b6859c491 Added ability to checkout consumables in variable qty 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-23 15:05:35 +01:00