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

15660 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ff113ef523 typo fix 2024-10-17 14:56:58 -07:00
Godfrey M
7ae76e7db9 remove viewdata array from 3 tests 2024-10-17 13:55:03 -07:00
Godfrey M
b98058ca98 fix tests pt 3 2024-10-17 13:48:26 -07:00
Godfrey M
83e8186d9e fix assertSent to AssertNotSent on some test 2024-10-17 13:39:56 -07:00
Godfrey M
cdd4fef7df attempt to fix tests p2 2024-10-17 13:34:55 -07:00
Godfrey M
dceb8e305f attempt to fix tests 2024-10-17 13:11:39 -07:00
Godfrey M
123cdeb858 add email check to listener 2024-10-17 12:39:48 -07:00
Godfrey M
496b44e887 merged composer lock from dev 2024-10-17 12:28:57 -07:00
Godfrey M
a690cc3582 removing my composer stuff again..for the last time 2024-10-17 12:26:55 -07:00
Godfrey M
ceb3f5cea6 added mail-gun and http-client to 8.1 2024-10-17 12:19:50 -07:00
Godfrey M
65735a31f1 removed symfony/mailgun-mailer symfony/http-client 2024-10-17 12:18:34 -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
9a79483375 removed namespaces from routing 2024-10-16 16:59:18 -07:00
Godfrey M
ed6034065b removed test route 2024-10-16 16:47: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
4becdca8aa removes toMail from license notificaqtion 2024-10-16 15:39:20 -07:00
Godfrey M
2584d60344 adds Licenses seat checkout Mailable 2024-10-16 15:38:49 -07:00
Godfrey M
f1d83a3f28 forgot to add asset checkout markdown to projet 2024-10-16 15:30:53 -07:00
Godfrey M
c39df34bdf forgot to add accessory mail to project 2024-10-16 15:29:50 -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
Godfrey M
b29d032bf0 adds checkoutAssetMail class, and content method 2024-10-15 11:28:27 -07:00
snipe
2500375400
Merge pull request #15672 from uberbrady/ldap_location_fixes 
Clean up how we use the '$location' in LDAP sync command
 2024-10-15 17:34:35 +01:00
Brady Wetherington
e4e1d0d50a Clean up how we use the '$location' in LDAP sync command 2024-10-15 17:26:31 +01:00
snipe
16c8264e76
Merge pull request #15671 from snipe/bug/sc-27147 
Bug/sc 27147
 2024-10-15 16:42:34 +01:00
snipe
0ae9ce0aa9 Cannot sort by updated at on Users [sc-27147] 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-15 16:41:45 +01:00
snipe
50b8f180b3 More logical grouping in allow_columns 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-15 16:41:39 +01:00
snipe
914a647204
Merge pull request #15669 from snipe/remlove_ou_requirenedess 
Fixed #15663 - remove requiredness for OU
 2024-10-15 12:47:15 +01:00
snipe
e9225ff3ea Switch to regular HTML for input form field 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-15 12:43:10 +01:00
snipe
d0d4159088 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-15 12:42:09 +01:00
snipe
69b6080bd8
Merge pull request #15666 from snipe/updated_readme_llm 
Added LLM note
 2024-10-15 10:31:29 +01:00
snipe
b997d728fb Added LLM note 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-15 10:30:34 +01:00
snipe
ddead359d0
Merge pull request #15660 from Toreg87/fixes/api_asset_create_fmcs2 
Refactor asset creation with API
 2024-10-14 14:29:34 +01:00
Tobias Regnery
f3c4e55667 Refactor asset creation with API 
Commit fb4fe3004 restored the previous behaviour to check the company_id in case of FullMultipleCompanySupport.
But after rereading the code and the laravel documentation, the check is already there where it belongs in AssetStoreRequest::prepareForValidation()
The bug is the is_int-check of the request input in prepareForValidation(). Is is of type string even if it is a numeric value, so the call to getIdForCurrentUser() never happend.
Fix this by removing the check and the now redundant call to getIdForCurrentUser().
Wrong values will get caught by the model-level validation rules.
 2024-10-14 15:14:41 +02:00
snipe
0d35335da7 Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-11 16:06:17 +01:00
snipe
feaa714304 Nicer disabled button 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-11 14:23:57 +01:00
snipe
e1a70023b1
Merge pull request #15655 from Toreg87/fixes/api_asset_create_fmcs 
Fixes #15654 Fix asset creation with API and FullMultipleCompanySupport
 2024-10-11 11:45:48 +01:00
snipe
de62359c67
Merge pull request #15533 from marcusmoore/testing/fmcs-accessories 
Added tests for accessory api controller
 2024-10-11 11:29:34 +01:00