DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
16580 commits 52 branches 269 tags 311 MiB
Commit graph

122 commits

Author SHA1 Message Date
snipe 1c8d94c953
Merge pull request #15525 from akemidx/updated_ad_hoc_notes 2025-01-14 11:33:21 +00:00
Godfrey M 001ccf1ce9 adds translation string instead of hardcoded message 2025-01-09 14:47:07 -08:00
Godfrey M 082a974ee3 changed from redirect with error to with warning 2025-01-09 14:26:54 -08:00
Godfrey M 152c23b8f3 changed log from warning to error 2025-01-09 12:55:25 -08:00
Godfrey M b635822a85 add try/catch around notification failing for inactive slack hooks 2025-01-09 12:51:54 -08:00
Godfrey M f6abf90ba0 fix locale check 2025-01-07 10:51:48 -08:00
Godfrey M 400833f834 reversed order of the acceptance and note paramter 2024-12-11 16:14:06 -08:00
Godfrey M 99464fcd86 fixes general webhook not firing 2024-12-02 10:19:24 -08:00
Godfrey M f7c1fc852d no checked out to email doesnt trigger a 500 2024-11-20 08:29:28 -08:00
Marcus Moore c399d797b4
Add conditional for microsoft team integration version 2024-11-13 14:29:01 -08:00
Godfrey M 1061df8c8b fix user checkout license category email check 2024-11-13 13:07:28 -08:00
Godfrey M 8389c03450 improved logging in checkoutable listener 2024-11-13 12:19:16 -08:00
Godfrey M 947351af67 removed unused variabl 2024-11-12 16:49:02 -08:00
Godfrey M 4e0d70e0b8 checkin notif was missing 2024-11-12 15:44:14 -08:00
Godfrey M 2362cb5e52 refactor to getNotifiables 2024-11-04 16:32:46 -08:00
Godfrey M 0d707a1851 fixes notifications for licenses and asset to asset checkouables 2024-11-04 15:13:10 -08:00
Godfrey M 21a27dcac1 fixed conflicts 2024-10-31 12:55:46 -07:00
Godfrey M 97a449e80e removes instanceof User check 2024-10-31 12:50:13 -07:00
Godfrey M e65942064e send emails even if target has no email 2024-10-31 12:45:29 -07:00
Godfrey M b26cae372c merged in develop 2024-10-30 10:40:23 -07:00
Godfrey M 58ff641f82 removed unused variables 2024-10-24 22:53:53 -07:00
Godfrey M ce68f550d8 remove alert emails from cc 2024-10-24 16:01:17 -07:00
Godfrey M 2cc2b2b1df apply array_filter to cc emails to prevent errors 2024-10-23 16:06:27 -07:00
Godfrey M 6c34a5c52c conditionally check cc emails, initiate variables 2024-10-23 14:54:21 -07:00
Godfrey M 1b5f4415ae corrected cc email behavior 2024-10-23 14:44:45 -07:00
Godfrey M 1e9922a0b0 fix moar tests 2024-10-22 16:14:36 -07:00
Godfrey M ead27accac fixed accessory tests and notifiable target 2024-10-22 15:45:52 -07:00
Godfrey M 1e31592c55 messing with the tests 2024-10-22 11:49:06 -07:00
Godfrey M 123cdeb858 add email check to listener 2024-10-17 12:39:48 -07:00
Godfrey M 285d6897cf added a coulple test adjustments and moved mail send logic to listener 2024-10-17 12:05:36 -07:00
Godfrey M a7754c1a7f fixed asset checkout markdown, and notifiable variable 2024-10-16 16:46:52 -07:00
Godfrey M 02bda3cd95 adds Checkout Consumable mailable and slackwebhook channel to notifs 2024-10-16 15:53:05 -07:00
Godfrey M 02ff646da4 adds checkin license mailable 2024-10-16 15:44:45 -07:00
Godfrey M 2584d60344 adds Licenses seat checkout Mailable 2024-10-16 15:38:49 -07:00
Godfrey M dcdf600b78 adds Checkin and Checkout mailables and listner logic 2024-10-16 15:27:34 -07:00
Godfrey M 9710436d54 adds Mailables for asset checkin and out 2024-10-16 13:12:07 -07:00
Godfrey M 16cffe9a9d simplified checkout webhook call 2024-10-16 12:53:35 -07:00
Godfrey M 9e1b86f586 sends checkout notification via webhook 2024-10-16 12:51:19 -07:00
Godfrey M 3ab2521cb0 email comes through, no picture and html markup appear though. 2024-10-16 12:21:33 -07:00
Godfrey M 9f06a0e441 handle some edge cases, null values clean up variable names 2024-10-15 14:01:28 -07:00
Godfrey M f8476f7133 finished the construct and mail call in the listner 2024-10-15 12:49:52 -07:00
snipe 6217cba201
Merge pull request #15524 from Godmartinz/double-notif-bug 
Fixed double webhook notifications // Separated email and webhook notifications.
 2024-09-30 19:24:19 +01:00
Marcus Moore e974c96eda
Update to created_by 2024-09-26 12:41:16 -07:00
Marcus Moore 2004e58b53
Merge branch 'develop' into updated_ad_hoc_notes 2024-09-26 12:29:28 -07:00
Godfrey M b32ab6a06c import User model 2024-09-18 16:36:24 -07:00
Godfrey M 4ff5fc1ff9 clean up variables 2024-09-18 16:19:35 -07:00
Godfrey M c40209f500 seperates emails and webhook notifications 2024-09-18 15:23:44 -07:00
snipe 1582d81e5b Change user_id to created_by 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-17 22:16:41 +01:00
akemidx 74efd850af redoing branch. old branch merge onflicts were waaay too gnarly 2024-09-16 19:30:26 -04:00
spencerrlongg 2412333152 added conditional to listener 2024-08-07 16:53:06 -05:00