Commit 26d7610b authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Merge branch 'develop' into 'main'

Release 08-08-22

See merge request !494
parents 4bc56018 e14b0b27
Pipeline #29943 failed with stages
in 3 minutes and 35 seconds
......@@ -6,3 +6,8 @@
npm --prefix private/typo3conf/ext/t3olayout/Build ci --python=python2.7
npm --prefix private/typo3conf/ext/t3olayout/Build run-script build --python=python2.7
# Doing frontend build for local frontend stuff
npm i gulp-cli -g
npm --prefix frontend install
cd frontend && gulp buildAll
name: typo3.org
type: typo3
docroot: public
php_version: "7.4"
php_version: "8.1"
webserver_type: nginx-fpm
router_http_port: "80"
router_https_port: "443"
......@@ -21,7 +21,7 @@ hooks:
- exec: cp private/typo3conf/AdditionalConfiguration.ddev.php private/typo3conf/AdditionalConfiguration.php
- exec: composer install
- exec: ./vendor/bin/typo3cms extension:setup
webimage_extra_packages: [build-essential, php7.4-ldap]
webimage_extra_packages: [build-essential]
use_dns_when_possible: true
timezone: Europe/Berlin
composer_version: "2"
......
......@@ -6,7 +6,7 @@ include:
variables:
GIT_STRATEGY: "none"
GIT_SSL_NO_VERIFY: "true"
STAGE_HOST: "typo3.dev"
STAGE_HOST: "t3o01.typo3server.ch"
PRODUCTION_HOST: "typo3.org"
STAGE_USER: "t3o-stage"
ADDITIONAL_TABLE_EXCLUDES: "-e 'tx_certifications_*' -e 'tx_t3odonation_domain_model_donation' -e 'tx_t3omembership_domain_model_member' -e 'tx_randombanners_domain_model_banner'"
......
......@@ -9,7 +9,7 @@ main:
deploy_type: prod
develop:
stage: develop
hostname: typo3.dev
hostname: t3o01.typo3server.ch
user: t3o-stage
writable_mode: chmod
forward_agent: true
......
......@@ -12,9 +12,8 @@
"email": "maintenance@typo3.org",
"issues": "https://git-t3o.typo3.org/t3o/typo3.org/issues"
},
"minimum-stability": "dev",
"require": {
"apache-solr-for-typo3/solr": "^11.5.0-rc-1",
"apache-solr-for-typo3/solr": "^11.5.0@rc",
"brotkrueml/typo3-matomo-widgets": "^1.3",
"cweagans/composer-patches": "^1.7",
"derhansen/sf_event_mgt": "^6.2",
......@@ -27,11 +26,11 @@
"spooner-web/just-vote": "^1.0",
"spooner/deployer-information": "^1.3",
"t3o/randombanners": "^3.0",
"t3o/t3o_donation": "@dev",
"t3o/t3o_donation": "^1.0",
"t3o/t3o_membership": "^4.0",
"t3o/t3olayout": "dev-feature/introduce-v11",
"t3o/t3org_layout": "@dev",
"t3o/typo3-roadmap": "@dev",
"t3o/t3org_layout": "^1.0",
"t3o/typo3-roadmap": "^1.0",
"typo3/cms-adminpanel": "^11.5",
"typo3/cms-dashboard": "^11.5",
"typo3/cms-linkvalidator": "^11.5",
......@@ -40,7 +39,7 @@
"typo3/cms-sys-note": "^11.5",
"typo3/cms-workspaces": "^11.5",
"yoast-seo-for-typo3/yoast_seo": "^8.1",
"sypets/brofix": "^3.2",
"sypets/brofix": "^4.0",
"sypets/page-callouts": "^2.0"
},
"require-dev": {
......@@ -88,7 +87,7 @@
"cweagans/composer-patches": true
},
"platform": {
"php": "7.4.27"
"php": "8.1.5"
}
},
"extra": {
......
This diff is collapsed.
......@@ -228,11 +228,11 @@ pageNewsRSS {
[global]
# if no uid is given for news articles, redirect to list view of general news articles
[page["uid"] == 185]
[traverse(page, "uid") == 185]
plugin.tx_news.settings.detail.errorHandling = redirectToPage,38,307
[global]
# if no uid is given for security advisories, redirect to list view of general news articles
[page["uid"] == 523]
[traverse(page, "uid") == 523]
plugin.tx_news.settings.detail.errorHandling = redirectToPage,32,307
[global]
......@@ -219,7 +219,7 @@ return [
'devIPmask' => '*',
'displayErrors' => 1,
'encryptionKey' => 'this.key.is.changed.on.remote.servers',
'exceptionalErrors' => 12290,
'exceptionalErrors' => 4096,
'features' => [
'felogin.extbase' => false,
'fluidBasedPageModule' => false,
......
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