Merge branch 'master' into feature/native-searchtools

# Conflicts:
#	administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php
This commit is contained in:
Roland Dalmulder 2022-01-28 19:29:33 +01:00
commit a6c73777b4
No known key found for this signature in database
GPG Key ID: 6D30CD38749A5B9E
1 changed files with 1 additions and 1 deletions

View File

@ -52,7 +52,7 @@ COM_PATCHTESTER_FIELD_CI_SERVER_SWITCH_OPTION_ON="On"
COM_PATCHTESTER_FIELD_GH_AUTH_DESC="Select 'Token' for a GitHub API Token"
COM_PATCHTESTER_FIELD_GH_AUTH_LABEL="GitHub Authentication Method"
COM_PATCHTESTER_FIELD_GH_AUTH_OPTION_TOKEN="Token"
COM_PATCHTESTER_FIELD_GH_TOKEN_DESC="Use this field to input a GitHub API Token in place of your username and password. Note that this is required if your account has Two Factor Authentication enabled.<p></p>To setup an access token, follow these steps.<ol><li><a href=""https://github.com/settings/tokens/new?description=Joomla%20Patch%20Tester&scopes=public_repo,repo:status"" target=""_blank"">Create a Personal Access Token</a></li><li>Click <span class=""font-weight-bold"">Generate token</span> at the bottom of the page</li><li>At the top in the green bar you will find your access token</li><li>Copy the token by selecting it or clicking on the clipboard</li><li>Paste the token in the <span class=""font-weight-bold"">GitHub Token</span> field above</li><li>Save the changes by clicking the <span class=""font-weight-bold"">Save & Close</span> button at the top</li><li>You can now use the Patch Tester with your token</li></ol><p>You can always revoke access by deleting the Personal access token from the <a href=""https://github.com/settings/tokens"" target=""_blank"">Personal access tokens on Github</a>.</p>"
COM_PATCHTESTER_FIELD_GH_TOKEN_DESC="Use this field to input a GitHub API Token in place of your username and password. Note that this is required if your account has Two Factor Authentication enabled.<p></p>To setup an access token, follow these steps.<ol><li><a href=\"https://github.com/settings/tokens/new?description=Joomla%20Patch%20Tester&scopes=public_repo,repo:status\" target=\"_blank\">Create a Personal Access Token</a></li><li>Click Generate token at the bottom of the page</li><li>At the top in the green bar you will find your access token</li><li>Copy the token by selecting it or clicking on the clipboard</li><li>Paste the token in the GitHub Token field above</li><li>Save the changes by clicking the Save & Close button at the top</li><li>You can now use the Patch Tester with your token</li></ol><p>You can always revoke access by deleting the Personal access token from the <a href=\"https://github.com/settings/tokens\" target=\"_blank\">Personal access tokens on Github</a>.</p>"
COM_PATCHTESTER_FIELD_GH_TOKEN_LABEL="GitHub Token"
COM_PATCHTESTER_FIELD_ORG_DESC="A username or organisation on GitHub to monitor pull requests for."
COM_PATCHTESTER_FIELD_ORG_LABEL="Custom Project Owner"