Commit b4bf07cb authored by Thomas Löffler's avatar Thomas Löffler

Merge branch 'develop' into 'master'

Release 05-05-20

See merge request !485
parents 0fe2821f dc09ecdb
Pipeline #8887 passed with stages
in 6 minutes and 27 seconds
include:
- project: 't3o/t3olayout'
ref: master
ref: 4.1.5
file: '/Configuration/GitLab/t3o-builds.yml'
stages:
......@@ -36,6 +36,24 @@ test:unit:
- composer install --ignore-platform-reqs
- composer test:unit
layout:
stage: layout
image: node:8
before_script:
- cd private/typo3conf/ext/t3olayout/Build
script:
- npm install
- npm run build
after_script:
- rm -Rf private/typo3conf/ext/t3olayout/Build/node_modules
artifacts:
paths:
- ./
expire_in: '4h'
dependencies:
- build
.deploy-template: &deploy_template
stage: deploy
image: composer:1
......@@ -78,28 +96,3 @@ deploy-master:
only:
- master
.maintenance: &maintenance_template
variables:
GIT_STRATEGY: none
stage: maintenance
when: manual
image:
name: composer:1
entrypoint: ["/bin/sh", "-c"]
before_script:
- apk add rsync --update
- mkdir -p /root/.ssh/
- eval $(ssh-agent -s)
- mkdir -p ~/.ssh
- echo "$SSH_PRIVATE_KEY_STAGE" | ssh-add -
- ssh-keyscan ${STAGE_HOST} >> /root/.ssh/known_hosts
Get dump for local environment:
<<: *maintenance_template
script:
- mkdir dump
- ssh ${STAGE_USER}@${STAGE_HOST} "php ./ci/current/vendor/bin/typo3cms database:export -c Default -e 'cf_*' -e 'cache_*' -e '[bf]e_sessions' -e '[bf]e_users' -e 'sys_log' -e 'sys_history' -e 'tx_solr_*' -e 'tx_igldapssoauth_config' | gzip -9 -c" > ./dump/dump.sql.gz
artifacts:
paths:
- ./dump/
expire_in: 1d
This diff is collapsed.
......@@ -39,5 +39,6 @@ solr_port_read: 8983
solr_path_read: /solr/
solr_use_write_connection: false
imports:
- { resource: "EXT:ter_layout/Configuration/Routes/Default.yaml" }
- { resource: "EXT:ter_fe2/Configuration/Routes/Extensions.yml" }
#
# Table structure for table 'tx_ter_extensionkeys'
#
......@@ -71,7 +70,7 @@ CREATE TABLE tx_ter_extensiondetails (
lastuploaddate int(11) DEFAULT '0' NOT NULL,
datasize int(11) DEFAULT '0' NOT NULL,
datasizecompressed int(11) DEFAULT '0' NOT NULL,
files text NOT NULL,
files longtext NOT NULL,
codelines int(11) DEFAULT '0' NOT NULL,
codebytes int(11) DEFAULT '0' NOT NULL,
techinfo text NOT NULL,
......
......@@ -583,8 +583,14 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
$this->composerName = $composerName;
}
public function getPackagistPage()
/**
* @return string
*/
public function getPackagistPage(): string
{
if (empty($this->composerName)) {
return '';
}
return 'https://packagist.org/packages/' . $this->composerName;
}
......
......@@ -30,6 +30,11 @@ class TerService
*/
protected $terApi;
/**
* @var string
*/
public $repositoryDir = '';
/**
* Load TER connection
*
......@@ -42,6 +47,7 @@ class TerService
$this->userData = new \stdClass();
$this->userData->username = $username;
$this->userData->password = $password;
$this->repositoryDir = $GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS']['ter']['repositoryDir'];
$this->terApi = new \tx_ter_api($this);
}
......
......@@ -180,3 +180,30 @@ config.tx_extbase.persistence.classes {
}
}
}
plugin.tx_seo {
config {
xmlSitemap {
sitemaps {
extensions {
provider = TYPO3\CMS\Seo\XmlSitemap\RecordsXmlSitemapDataProvider
config {
table = tx_terfe2_domain_model_extension
additionalWhere = last_version > 0
sortField = ext_key
lastModifiedField = tstamp
recursive = 1
pid = 2
url {
pageId = 3
fieldToParameterMap {
uid = tx_terfe2_pi1[extension]
}
useCacheHash = 1
}
}
}
}
}
}
}
......@@ -146,7 +146,7 @@
</f:if>
<f:if condition="{extension.externalManual}">
<f:then>
<f:render partial="ExternalButtonLink" arguments="{externalLink: extension.externalManual, icon: 'fa-book', label: 'Extension Manual', btnStyle: 'btn-info'}"/>
<f:render partial="ExternalButtonLink" arguments="{externalLink: extension.externalManual, icon: 'fa-book', label: 'External Manual', btnStyle: 'btn-info'}"/>
</f:then>
<f:else>
<f:render partial="ExternalButtonLink" arguments="{externalLink: documentationLink, icon: 'fa-book', label: 'Extension Manual', btnStyle: 'btn-info'}"/>
......
routeEnhancers:
PageTypeSuffix:
type: PageType
default: /
index: ''
map:
/: 0
sitemap.xml: 1533906435
......@@ -83,7 +83,7 @@
<f:if condition="{document.insecure_boolS}">
<f:else>
<a class="btn {f:if(condition:exactMatchFound, then: 'btn-primary-lg', else: 'btn-primary')} btn-block mb-0 w-100" href="{document.extensionDownloadZipUrl_stringS}" title="Downlad version {document.extensionVersion_stringS} of TYPO3 extension {document.extensionKey_stringS}">
<i class="fa fa-download"></i> v{document.extensionVersion_stringS} (zip)
<i class="fa fa-download"></i> v{document.extensionVersion_stringS}
</a>
</f:else>
</f:if>
......
@import 'EXT:seo/Configuration/TypoScript/XmlSitemap/constants.typoscript'
plugin.tx_seo.settings.xmlSitemap.sitemaps.pages.additionalWhere = no_index = 0 AND canonical_link = '' AND nav_hide = 0
......@@ -5,3 +5,5 @@ page.meta {
og:title >
}
[global]
@import 'EXT:seo/Configuration/TypoScript/XmlSitemap/setup.typoscript'
......@@ -133,7 +133,7 @@ return [
],
'devIPmask' => '*',
'displayErrors' => 1,
'encryptionKey' => '52fd0fa7b7337befc0840fd8ad8fd8868fc9d98f60ea9b6e737ce732448e80eb35d2662bc15d04eb523171ec727c1dee',
'encryptionKey' => 'this.key.is.changed.on.remote.servers',
'exceptionalErrors' => 12290,
'sitename' => 'Extension',
'systemLogLevel' => 0,
......
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