forked from opencart/opencart
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request opencart#14045 from TheCartpenter/patch-117
Fixed indent in install/view/common/footer
- Loading branch information
Showing
23 changed files
with
60 additions
and
44 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| <footer class="pb-4"> | ||
| <div class="container text-center"> | ||
| <a href="https://www.opencart.com/?utm_source=opencart_install&utm_medium=footer_link&utm_campaign=opencart_install" target="_blank">{{ text_project }}</a> | <a href="http://docs.opencart.com/?utm_source=opencart_install&utm_medium=footer_link&utm_campaign=opencart_install" target="_blank">{{ text_documentation }}</a> | <a href="https://forum.opencart.com/?utm_source=opencart_install&utm_medium=footer_link&utm_campaign=opencart_install" target="_blank">{{ text_support }}</a> | ||
| <br/> | ||
| {{ text_footer }} | ||
| </div> | ||
| <div class="container text-center"> | ||
| <a href="https://www.opencart.com/?utm_source=opencart_install&utm_medium=footer_link&utm_campaign=opencart_install" target="_blank">{{ text_project }}</a> | <a href="http://docs.opencart.com/?utm_source=opencart_install&utm_medium=footer_link&utm_campaign=opencart_install" target="_blank">{{ text_documentation }}</a> | <a href="https://forum.opencart.com/?utm_source=opencart_install&utm_medium=footer_link&utm_campaign=opencart_install" target="_blank">{{ text_support }}</a> | ||
| <br/> | ||
| {{ text_footer }} | ||
| </div> | ||
| </footer> | ||
| </div> | ||
| </body> | ||
| </html> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
upload/system/storage/vendor/aws/aws-sdk-php/src/data/acm-pca/2017-08-22/waiters-2.json.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| <?php | ||
| // This file was auto-generated from sdk-root/src/data/acm-pca/2017-08-22/waiters-2.json | ||
| return [ 'version' => 2, 'waiters' => [ 'AuditReportCreated' => [ 'description' => 'Wait until a Audit Report is created', 'delay' => 3, 'maxAttempts' => 40, 'operation' => 'DescribeCertificateAuthorityAuditReport', 'acceptors' => [ [ 'matcher' => 'path', 'argument' => 'AuditReportStatus', 'state' => 'success', 'expected' => 'SUCCESS', ], [ 'matcher' => 'path', 'argument' => 'AuditReportStatus', 'state' => 'failure', 'expected' => 'FAILED', ], [ 'matcher' => 'error', 'state' => 'failure', 'expected' => 'AccessDeniedException', ], ], ], 'CertificateAuthorityCSRCreated' => [ 'description' => 'Wait until a Certificate Authority CSR is created', 'delay' => 3, 'maxAttempts' => 40, 'operation' => 'GetCertificateAuthorityCsr', 'acceptors' => [ [ 'matcher' => 'error', 'state' => 'success', 'expected' => false, ], [ 'matcher' => 'error', 'state' => 'retry', 'expected' => 'RequestInProgressException', ], [ 'matcher' => 'error', 'state' => 'failure', 'expected' => 'AccessDeniedException', ], ], ], 'CertificateIssued' => [ 'description' => 'Wait until a certificate is issued', 'delay' => 1, 'maxAttempts' => 120, 'operation' => 'GetCertificate', 'acceptors' => [ [ 'matcher' => 'error', 'state' => 'success', 'expected' => false, ], [ 'matcher' => 'error', 'state' => 'retry', 'expected' => 'RequestInProgressException', ], [ 'matcher' => 'error', 'state' => 'failure', 'expected' => 'AccessDeniedException', ], ], ], ],]; | ||
| return [ 'version' => 2, 'waiters' => [ 'CertificateAuthorityCSRCreated' => [ 'description' => 'Wait until a Certificate Authority CSR is created', 'operation' => 'GetCertificateAuthorityCsr', 'delay' => 3, 'maxAttempts' => 60, 'acceptors' => [ [ 'state' => 'success', 'matcher' => 'status', 'expected' => 200, ], [ 'state' => 'retry', 'matcher' => 'error', 'expected' => 'RequestInProgressException', ], [ 'state' => 'failure', 'matcher' => 'error', 'expected' => 'AccessDeniedException', ], ], ], 'CertificateIssued' => [ 'description' => 'Wait until a certificate is issued', 'operation' => 'GetCertificate', 'delay' => 1, 'maxAttempts' => 60, 'acceptors' => [ [ 'state' => 'success', 'matcher' => 'status', 'expected' => 200, ], [ 'state' => 'retry', 'matcher' => 'error', 'expected' => 'RequestInProgressException', ], [ 'state' => 'failure', 'matcher' => 'error', 'expected' => 'AccessDeniedException', ], ], ], 'AuditReportCreated' => [ 'description' => 'Wait until a Audit Report is created', 'operation' => 'DescribeCertificateAuthorityAuditReport', 'delay' => 3, 'maxAttempts' => 60, 'acceptors' => [ [ 'state' => 'success', 'matcher' => 'path', 'argument' => 'AuditReportStatus', 'expected' => 'SUCCESS', ], [ 'state' => 'failure', 'matcher' => 'path', 'argument' => 'AuditReportStatus', 'expected' => 'FAILED', ], [ 'state' => 'failure', 'matcher' => 'error', 'expected' => 'AccessDeniedException', ], ], ], ],]; |
2 changes: 1 addition & 1 deletion
2
upload/system/storage/vendor/aws/aws-sdk-php/src/data/connect/2017-08-08/api-2.json.php
Large diffs are not rendered by default.
Oops, something went wrong.
Oops, something went wrong.