Commit 3f94ed29 authored by Stefan Busemann's avatar Stefan Busemann

Merge branch 'develop' into 499-add-multiple-contributors-and-their-role-to-news-articles

parents 37c089d5 8c6d41e9
Pipeline #9482 failed with stages
in 2 minutes and 9 seconds
# EditorConfig is awesome: http://EditorConfig.org
# top-most EditorConfig file
root = true
# Unix-style newlines with a newline ending every file
[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
# CSS-Files
[*.css]
indent_style = tab
indent_size = 4
# HTML-Files
[*.html]
indent_style = tab
indent_size = 2
# TMPL-Files
[*.tmpl]
indent_style = tab
indent_size = 4
# SCSS-Files
[*.scss]
indent_style = space
indent_size = 4
# JS-Files
[*.js]
indent_style = space
indent_size = 2
# JSON-Files
[*.json]
indent_style = tab
indent_size = 4
# PHP-Files
[*.php]
indent_style = space
indent_size = 4
# ReST-Files
[*.rst]
indent_style = space
indent_size = 3
# MD-Files
[*.md]
indent_style = space
indent_size = 4
# YAML-Files
[{*.yaml,*.yml}]
indent_style = space
indent_size = 2
# package.json
# .travis.yml
# bower.json
[{package.json,.travis.yml,bower.json}]
indent_style = space
indent_size = 2
# TypoScript
[*.ts]
indent_style = space
indent_size = 2
[*.typoscript]
indent_style = space
indent_size = 2
[*.tsconfig]
indent_style = space
indent_size = 2
# XLF-Files
[*.xlf]
indent_style = tab
indent_size = 4
# SQL-Files
[*.sql]
indent_style = tab
indent_size = 2
\ No newline at end of file
include:
- project: 't3o/t3olayout'
ref: master
ref: main
file: '/Configuration/GitLab/t3o-builds.yml'
variables:
......@@ -58,15 +58,3 @@ deploy-develop:
url: https://${STAGE_HOST}
only:
- develop
warmup:cache:
stage: warmup
image:
name: quentinsf/sitediff:alpine
entrypoint: ["/bin/sh", "-c"]
script:
- sitediff init https://${PRODUCTION_HOST}
dependencies:
- deploy-master
only:
- master
This diff is collapsed.
......@@ -40,7 +40,7 @@ routeEnhancers:
plugin: Pi1
routes:
-
routePath: '/{page}'
routePath: '/page-{page}'
_controller: 'News::list'
_arguments:
page: '@widget_0/currentPage'
......@@ -59,7 +59,7 @@ routeEnhancers:
_arguments:
category-name: overwriteDemand/categories
-
routePath: '/{category-name}/{page}'
routePath: '/{category-name}/page-{page}'
_controller: 'News::list'
_arguments:
category-name: overwriteDemand/categories
......
@import 'EXT:seo/Configuration/TypoScript/XmlSitemap'
@import 'EXT:news/Configuration/TypoScript/Sitemap'
plugin.tx_seo {
config {
xmlSitemap {
sitemaps {
pages {
config {
excludedDoktypes = 3, 4, 5, 6, 7, 199, 254, 255
additionalWhere = AND (no_index = 0)
}
}
news {
provider = TYPO3\CMS\Seo\XmlSitemap\RecordsXmlSitemapDataProvider
config {
table = tx_news_domain_model_news
additionalWhere =
sortField = sorting
lastModifiedField = tstamp
pid = 179
recursive = 2
url {
pageId = 185
fieldToParameterMap {
uid = tx_news_pi1[news]
}
config {
xmlSitemap {
sitemaps {
pages {
config {
excludedDoktypes = 3, 4, 5, 6, 7, 199, 254, 255
additionalWhere = AND (no_index = 0)
}
}
additionalGetParameters {
tx_news_pi1.controller = News
tx_news_pi1.action = detail
}
news {
provider = TYPO3\CMS\Seo\XmlSitemap\RecordsXmlSitemapDataProvider
config {
table = tx_news_domain_model_news
additionalWhere =
sortField = sorting
lastModifiedField = tstamp
pid = 179
recursive = 2
url {
pageId = 185
fieldToParameterMap {
uid = tx_news_pi1[news]
}
useCacheHash = 1
}
}
}
events {
provider = TYPO3\CMS\Seo\XmlSitemap\RecordsXmlSitemapDataProvider
config {
table = tx_sfeventmgt_domain_model_event
sortField = tstamp
lastModifiedField = tstamp
pid = 180,43,461
recursive = 2
url {
pageId = 230
fieldToParameterMap {
uid = tx_sfeventmgt_pievent[event]
}
additionalGetParameters {
tx_sfeventmgt_pievent.controller = Event
tx_sfeventmgt_pievent.action = detail
}
useCacheHash = 1
}
}
additionalGetParameters {
tx_news_pi1 {
controller = News
action = detail
}
}
useCacheHash = 1
}
}
}
events {
provider = TYPO3\CMS\Seo\XmlSitemap\RecordsXmlSitemapDataProvider
config {
table = tx_sfeventmgt_domain_model_event
sortField = tstamp
lastModifiedField = tstamp
pid = 180,43,461
recursive = 2
url {
pageId = 230
fieldToParameterMap {
uid = tx_sfeventmgt_pievent[event]
}
additionalGetParameters {
tx_sfeventmgt_pievent {
controller = Event
action = detail
}
}
useCacheHash = 1
}
}
}
}
}
}
}
......@@ -67,6 +67,11 @@ return [
'throwExceptionAtLogin' => '1',
'useExtConfConfiguration' => '0',
],
'matomo_widgets' => [
'idSite' => '2',
'tokenAuth' => '',
'url' => 'https://piwik.typo3.org',
],
'news' => [
'advancedMediaPreview' => '1',
'archiveDate' => 'date',
......
Markdown is supported
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