Skip to content

Commit

Permalink
Merge branch 'release/12.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
@garbast
garbast committed Feb 7, 2024
2 parents d314696 + 07e35ed commit 5383034
Show file tree
Hide file tree
Showing 7 changed files with 81 additions and 71 deletions.
2 changes: 1 addition & 1 deletion Classes/Command/CleanupCommand.php
View file
Expand Up @@ -57,7 +57,7 @@ protected function configure()
);
}

public function execute(InputInterface $input, OutputInterface $output)
public function execute(InputInterface $input, OutputInterface $output): int
{
$io = new SymfonyStyle($input, $output);
$result = self::FAILURE;
Expand Down
10 changes: 5 additions & 5 deletions Configuration/TypoScript/Common/constants.typoscript
View file
Expand Up @@ -16,19 +16,19 @@ plugin.tx_sfregister.view {


plugin.tx_sfregister.settings {
# cat=sf_register.settings//10; type=int+; label=LLL:EXT:sf_register/Resources/Private/Language/locallang_ts.xlf:common.createPid
# cat=sf_register.settings//11; type=int+; label=LLL:EXT:sf_register/Resources/Private/Language/locallang_ts.xlf:common.createPid
createPid = 0

# cat=sf_register.settings//10; type=int+; label=LLL:EXT:sf_register/Resources/Private/Language/locallang_ts.xlf:common.editPid
# cat=sf_register.settings//12; type=int+; label=LLL:EXT:sf_register/Resources/Private/Language/locallang_ts.xlf:common.editPid
editPid = 0

# cat=sf_register.settings//10; type=int+; label=LLL:EXT:sf_register/Resources/Private/Language/locallang_ts.xlf:common.passwordPid
# cat=sf_register.settings//13; type=int+; label=LLL:EXT:sf_register/Resources/Private/Language/locallang_ts.xlf:common.passwordPid
passwordPid = 0

# cat=sf_register.settings//10; type=int+; label=LLL:EXT:sf_register/Resources/Private/Language/locallang_ts.xlf:common.invitePid
# cat=sf_register.settings//14; type=int+; label=LLL:EXT:sf_register/Resources/Private/Language/locallang_ts.xlf:common.invitePid
invitePid = 0

# cat=sf_register.settings//10; type=int+; label=LLL:EXT:sf_register/Resources/Private/Language/locallang_ts.xlf:common.resendPid
# cat=sf_register.settings//15; type=int+; label=LLL:EXT:sf_register/Resources/Private/Language/locallang_ts.xlf:common.resendPid
resendPid = 0

# cat=sf_register.settings//30; type=text; label= LLL:EXT:sf_register/Resources/Private/Language/locallang_ts.xlf:common.captchaId
Expand Down
110 changes: 55 additions & 55 deletions Configuration/TypoScript/maximal/constants.typoscript
View file

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions Configuration/TypoScript/minimal/constants.typoscript
View file
Expand Up @@ -19,20 +19,20 @@ plugin.tx_sfregister.settings {
# cat=sf_register.settings//55; type=boolean; label= LLL:EXT:sf_register/Resources/Private/Language/locallang_ts.xlf:minimal.autologinPostConfirmation
autologinPostConfirmation = 0

# cat=sf_register.settings//10; type=int+; label= LLL:EXT:sf_register/Resources/Private/Language/locallang_ts.xlf:minimal.usergroupPostSave
# cat=sf_register.settings//15; type=int+; label= LLL:EXT:sf_register/Resources/Private/Language/locallang_ts.xlf:minimal.usergroupPostSave
usergroupPostSave = 0
# cat=sf_register.settings//10; type=int+; label= LLL:EXT:sf_register/Resources/Private/Language/locallang_ts.xlf:minimal.usergroupPostConfirm
# cat=sf_register.settings//16; type=int+; label= LLL:EXT:sf_register/Resources/Private/Language/locallang_ts.xlf:minimal.usergroupPostConfirm
usergroupPostConfirm = 0
# cat=sf_register.settings//10; type=int+; label= LLL:EXT:sf_register/Resources/Private/Language/locallang_ts.xlf:minimal.usergroupPostAccept
# cat=sf_register.settings//17; type=int+; label= LLL:EXT:sf_register/Resources/Private/Language/locallang_ts.xlf:minimal.usergroupPostAccept
usergroupPostAccept = 0
# cat=sf_register.settings//10; type=int+; label= LLL:EXT:sf_register/Resources/Private/Language/locallang_ts.xlf:minimal.usergroup
# cat=sf_register.settings//18; type=int+; label= LLL:EXT:sf_register/Resources/Private/Language/locallang_ts.xlf:minimal.usergroup
usergroup = 0

# cat=sf_register.settings//30; type=text; label= LLL:EXT:sf_register/Resources/Private/Language/locallang_ts.xlf:minimal.emailSitename
# cat=sf_register.settings//31; type=text; label= LLL:EXT:sf_register/Resources/Private/Language/locallang_ts.xlf:minimal.emailSitename
emailSitename = dummy Site

# cat=sf_register.settings//30; type=text; label= LLL:EXT:sf_register/Resources/Private/Language/locallang_ts.xlf:minimal.emailName
# cat=sf_register.settings//32; type=text; label= LLL:EXT:sf_register/Resources/Private/Language/locallang_ts.xlf:minimal.emailName
emailName = userEmail from
# cat=sf_register.settings//30; type=text; label= LLL:EXT:sf_register/Resources/Private/Language/locallang_ts.xlf:minimal.emailAddress
# cat=sf_register.settings//33; type=text; label= LLL:EXT:sf_register/Resources/Private/Language/locallang_ts.xlf:minimal.emailAddress
emailAddress = userEmailfrom@test.local
}
2 changes: 1 addition & 1 deletion Documentation/Settings.cfg
View file
@@ -1,6 +1,6 @@
[general]
project = sf_register
release = 12.0.0
release = 12.0.1
copyright = since 2010 by evoWeb

[html_theme_options]
Expand Down
10 changes: 10 additions & 0 deletions Resources/Private/Partials/Preview/DisabledEmail.html
View file
@@ -0,0 +1,10 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">

<f:variable name="fieldName">email</f:variable>
<div class="col-md-6 mb-3 {fieldName}">
<label><f:translate id="{fieldName}" /></label>
<f:form.hidden property="{fieldName}" />
<p class="form-control-plaintext">{user.{fieldName}}</p>
</div>

</html>
4 changes: 2 additions & 2 deletions ext_emconf.php
View file
Expand Up @@ -9,10 +9,10 @@
'author_company' => 'evoWeb',
'state' => 'stable',
'clearCacheOnLoad' => true,
'version' => '12.0.0',
'version' => '12.0.1',
'constraints' => [
'depends' => [
'typo3' => '12.2.0-12.4.99',
'typo3' => '12.4.10-12.4.99',
],
'suggests' => [
'extender' => '10.0.0-',
Expand Down

0 comments on commit 5383034

Please sign in to comment.