Skip to content

Commit

Permalink
Merge branch '1.x' into dbal_array_parameter_type
Browse files Browse the repository at this point in the history
# Conflicts:
#	composer.json
  • Loading branch information
blankse committed Sep 28, 2023
2 parents 2526743 + 76d9b87 commit 38b67a8
Show file tree
Hide file tree
Showing 4 changed files with 82 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/codeception.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ jobs:
runs-on: "ubuntu-20.04"
continue-on-error: ${{ matrix.experimental }}
env:
PIMCORE_TEST_DB_DSN: "mysql://[email protected]:33006/pimcore_test?serverVersion=${{ matrix.server_version }}"
PIMCORE_TEST_DB_DSN: "mysql://[email protected]:33006/pimcore_test"
strategy:
matrix:
include:
- { php-version: 8.1, database: "mariadb:10.7", server_version: "10.7.7-MariaDB-1:10.7.7+maria~ubu2004", dependencies: highest, experimental: false }
- { php-version: 8.2, database: "mariadb:10.7", server_version: "10.7.7-MariaDB-1:10.7.7+maria~ubu2004", dependencies: highest, experimental: false }
- { php-version: 8.2, database: "mariadb:10.7", server_version: "10.7.7-MariaDB-1:10.7.7+maria~ubu2004", dependencies: highest, pimcore_version: "11.x-dev as 11.0.0", experimental: true }
- { php-version: 8.1, database: "mariadb:10.3", dependencies: lowest, experimental: false }
- { php-version: 8.2, database: "mariadb:10.11", dependencies: highest, experimental: false }
- { php-version: 8.2, database: "mariadb:10.11", dependencies: highest, pimcore_version: "11.x-dev as 11.0.0", experimental: true }

services:
redis:
Expand Down
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@
}
},
"prefer-stable": true,
"minimum-stability": "dev",
"require": {
"doctrine/dbal": "^3.6",
"pimcore/pimcore": "^11.0",
"pimcore/admin-ui-classic-bundle": "^1.1"
"pimcore/admin-ui-classic-bundle": "^1.1",
"pimcore/pimcore": "^11.0"
},
"require-dev": {
"phpstan/phpstan": "^1.10.5",
Expand Down
1 change: 1 addition & 0 deletions src/Processor/Chromium.php
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ public function getPdfFromString(string $html, array $params = [], bool $returnF
'startupTimeout' => 120,
'enableImages' => true,
'ignoreCertificateErrors' => true,
'customFlags' => [ '--disable-dev-shm-usage', '--disable-gpu'],
]);
}

Expand Down
75 changes: 75 additions & 0 deletions translations/admin.pt_br.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
---
add_printpage: Add PrintPage
add_printcontainer: Add PrintContainer
web2print_settings: Web-to-Print Settings
web2print_preview_pdf: Generate & Preview PDF
web2print_cancel_pdf_creation: Cancel PDF Creation
web2print_generate_pdf: Generate PDF
web2print_download_pdf: Download PDF
web2print_last-generated: Last Generated
web2print_last-generate-message: Last Generate Message
web2print: Web-to-Print
web2print_prepare_pdf_generation: Prepare PDF Generation
web2print_start_html_rendering: Start HTML Rendering
web2print_finished_html_rendering: Finished HTML Rendering
web2print_saved_html_file: Saved HTML File
web2print_pdf_conversion: PDF Conversion
web2print_saving_pdf_document: Save PDF Document
web2print_author: Author
web2print_printermarks: Printermarks
web2print_bookmarks: Bookmarks
web2print_only_published: Only possible with published documents.
web2print_documents_changed: Documents changed since last pdf generation.
web2print_addOverprint: Overprinting
web2print_enableDebugMode: Enable debug mode
web2print_enableLenientHttpsMode: Enable lenient HTTPS mode
web2print_enableLenientHttpsMode_txt: Enable this option if PDFreactor fails to connect
successfully via HTTPS
web2print_tags: tags
web2print_links: links
web2print_tool: Tool
web2print_save_mode: Document Save Mode
web2print_save_mode_txt: Document Save Mode = cleanup deletes all not used document
elements for current document. This might be necessary for useage reports in print
documents.
web2print_pdfreactor_settings: PDFreactor Settings
web2print_server: Server
web2print_baseURL: BaseURL
web2print_baseURL_txt: BaseURL for PDFreactor. This is prefixed to each relative url
in print templates when creating PDFs.
web2print_docker_baseURL_txt: This is prefixed to each relative url in print templates
when creating PDFs.
web2print_apiKey_txt: If the PDFreactor instance is set up to require API keys, you
can enter it here.
web2print_json_converter: Open JSON converter/validator
web2print_licence: Licence
web2print_gotenberg_settings: Gotenberg Settings
web2print_gotenberg_documentation: Option Documentation
web2print_gotenberg_documentation_additions: Warning
web2print_gotenberg_documentation_additions_text: Since Gotenberg is Docker-powered
service, it requires absolute urls to work. By default, it works within the same
container by using `http://nginx:80` as host url. Please override this configuration
accordingly into the settings below.
web2print_headlesschrome_json_converter: ""
web2print_hostname: Hostname
web2print_protocol: Protocol
web2print_port: Port
web2print_apiKey: API Key
web2print_chromium_requirements: Requirements
web2print_chromium_requirements_documentation: Please make sure to install chrome-php/chrome
via composer
web2print_chromium_settings: Chromium settings
web2print_chromium_documentation: Option Documentation
web2print_chromium_options_documentation: Please make sure following configuration
matches the option available on Chrome DevTools Documentation, any other values
may break the pdf generation
web2print_chromium_documentation_additions: Additional Options
web2print_chromium_documentation_additions_text: 'There are two additional options:
"header" and "footer". This options need a URL, which returns the header or footer
template.'
web2print_chromium_documentation_docker: Notes for Dockerized Chromium
web2print_chromium_documentation_docker_text: When using a Dockerized Chromium through
WebSocket, the following field must be set to the web server service accordingly.
eg. `http://nginx:80`
web2print_hostURL: Host Url
...

0 comments on commit 38b67a8

Please sign in to comment.