Commit 8df84788 authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Merge branch 'develop' into 401-planet-typo3

parents aecfca2f 0ff6b8d5
Pipeline #10192 failed
......@@ -9,6 +9,7 @@ xdebug_enabled: false
additional_hostnames: []
additional_fqdns: []
mariadb_version: "10.3"
mysql_version: ""
provider: default
hooks:
post-import-db:
......@@ -21,12 +22,13 @@ hooks:
webimage_extra_packages: [php7.4-ldap]
use_dns_when_possible: true
timezone: Europe/Berlin
composer_version: "1"
# This config.yaml was created with ddev version v1.14.1
# webimage: drud/ddev-webserver:v1.14.1
# dbimage: drud/ddev-dbserver-mariadb-10.2:v1.14.1
# dbaimage: phpmyadmin/phpmyadmin:5
# This config.yaml was created with ddev version v1.16.2
# webimage: drud/ddev-webserver:v1.16.2
# dbimage: drud/ddev-dbserver-mariadb-10.2:v1.16.0
# dbaimage: phpmyadmin:5
# However we do not recommend explicitly wiring these images into the
# config.yaml as they may break future versions of ddev.
# You can update this config.yaml using 'ddev config'.
......@@ -40,7 +42,7 @@ timezone: Europe/Berlin
# docroot: <relative_path> # Relative path to the directory containing index.php.
# php_version: "7.3" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4"
# php_version: "7.3" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4" "8.0"
# You can explicitly specify the webimage, dbimage, dbaimage lines but this
# is not recommended, as the images are often closely tied to ddev's' behavior,
......@@ -61,10 +63,10 @@ timezone: Europe/Berlin
# xdebug_enabled: false # Set to true to enable xdebug and "ddev start" or "ddev restart"
# Note that for most people the commands
# "ddev exec enable_xdebug" and "ddev exec disable_xdebug" work better,
# "ddev xdebug" to enable xdebug and "ddev xdebug off" to disable it work better,
# as leaving xdebug enabled all the time is a big performance hit.
# webserver_type: nginx-fpm # Can be set to apache-fpm or apache-cgi as well
# webserver_type: nginx-fpm # or apache-fpm
# timezone: Europe/Berlin
# This is the timezone used in the containers and by PHP;
......@@ -72,6 +74,13 @@ timezone: Europe/Berlin
# see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
# For example Europe/Dublin or MST7MDT
# composer_version: "2"
# if composer_version:"" it will use the current ddev default composer release.
# It can also be set to "1", to get most recent composer v1
# or "2" for most recent composer v2.
# It can be set to any existing specific composer version.
# After first project 'ddev start' this will not be updated until it changes
# additional_hostnames:
# - somename
# - someothername
......@@ -94,7 +103,7 @@ timezone: Europe/Berlin
# These values specify the destination directory for ddev ssh and the
# directory in which commands passed into ddev exec are run.
# omit_containers: ["db", dba", "ddev-ssh-agent"]
# omit_containers: [db, dba, ddev-ssh-agent]
# Currently only these containers are supported. Some containers can also be
# omitted globally in the ~/.ddev/global_config.yaml. Note that if you omit
# the "db" container, several standard features of ddev that access the
......@@ -128,7 +137,7 @@ timezone: Europe/Berlin
# mailhog_https_port: "8026"
# The MailHog ports can be changed from the default 8025 and 8026
# webimage_extra_packages: [php-yaml, php7.3-ldap]
# webimage_extra_packages: [php7.3-tidy, php-bcmath]
# Extra Debian packages that are needed in the webimage can be added here
# dbimage_extra_packages: [telnet,netcat]
......@@ -156,9 +165,9 @@ timezone: Europe/Berlin
# In this case the user must provide all such settings.
# no_project_mount: false
# (Experimental) If true, ddev will not mount the project into the web container;
# (Experimental) If true, ddev will not mount the project into the web container;
# the user is responsible for mounting it manually or via a script.
# This is to enable experimentation with alternate file mounting strategies.
# This is to enable experimentation with alternate file mounting strategies.
# For advanced users only!
# provider: default # Currently either "default" or "pantheon"
......
This diff is collapsed.
......@@ -200,6 +200,7 @@ return [
'foreign_table' => 'fe_users',
'minitems' => 0,
'maxitems' => 1,
'default' => 0
]
],
'account' => [
......@@ -217,10 +218,11 @@ return [
'exclude' => 1,
'label' => 'LLL:EXT:t3o_donation/Resources/Private/Language/locallang_db.xlf:tx_t3odonation_domain_model_donation.date',
'config' => [
'type' => 'input',
'type' => 'input',
'size' => '30',
'eval' => 'datetime',
'renderType' => 'inputDateTime',
'default' => 0
]
],
'crdate' => [
......
plugin.tx_news {
view {
templateRootPaths {
2 = EXT:t3org_layout/Resources/Private/Templates/News/Security/
99 = EXT:t3org_layout/Resources/Private/Templates/News/Security/
}
partialRootPaths {
2 = EXT:t3org_layout/Resources/Private/Partials/News/Security/
99 = EXT:t3org_layout/Resources/Private/Partials/News/Security/
}
layoutRootPaths {
2 = EXT:t3org_layout/Resources/Private/Layouts/News/Security/
99 = EXT:t3org_layout/Resources/Private/Layouts/News/Security/
}
}
......
......@@ -34,5 +34,24 @@ security/advisory/ ==> detail page
Article detail page UID needs to be 523
templateRootPaths, partialRootPaths, layoutRootPaths are set to 99, in order to apply the templates. This won't work,
if there is another template, which brings a higher configuration number (f.e. 100)
plugin.tx_news {
view {
templateRootPaths {
99 = EXT:t3org_layout/Resources/Private/Templates/News/Security/
}
partialRootPaths {
99 = EXT:t3org_layout/Resources/Private/Partials/News/Security/
}
layoutRootPaths {
99 = EXT:t3org_layout/Resources/Private/Layouts/News/Security/
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment