Skip to content

Commit

Permalink
[TASK] Release of 8.0.1 to extensions.typo3.org
Browse files Browse the repository at this point in the history
Merge branch 'main' of github.com:in2code-de/femanager

* 'main' of github.com:in2code-de/femanager: (47 commits)
  [SECURITY] Release of 7.2.3
  [BUGFIX] Dont use initilize actions for granting access
  [TASK] Use PHP8 for local development
  [TASK] Update DDEV to unique project name for TYPO3 11 for local development
  [SECURITX]  Release 7.2.2
  [BUGFIX] Add missing permission check for invitation controlling
  [BUGFIX] Fix javascript console error
  [BUGFIX] use proper colspan in user backend list table header
  [TASK] Release 7.2.1
  [FIX] Fixes reaction when no typoscript configuration is set for redirect
  [TASK] Adds documentation for extended
  [TASK] Update Image used for Github Actions  932076
  [TASK] Removes femanagerextended from development setup
  [TASK] Release 7.2
  [BUGFIX] Fixed Object Support for getDirtyPropertiesFromUser()
  [TASK] Build new JS distribution file
  [TASK] Remove unnecessary scrollIntoView property
  [TASK] Build new JS distribution file
  [TASK] Replace jQuery scrollTop with vanilla scrollIntoView
  [TASK] Corrects Documenation Rendering Configuration
  ...

# Conflicts:
#	.ddev/config.yaml
#	.ddev/typo3/additional.php
#	.project/TYPO3/DockerConfiguration.php
#	.project/TYPO3/config.yaml
#	Classes/Controller/AbstractController.php
#	Classes/Controller/EditController.php
#	Classes/Controller/InvitationController.php
#	Classes/Controller/UserBackendController.php
#	Classes/DataProcessor/ImageManipulation.php
#	Classes/Domain/Model/User.php
#	Classes/Utility/BackendUserUtility.php
#	Classes/Utility/ConfigurationUtility.php
#	Classes/Utility/UserUtility.php
#	Configuration/TypoScript/Main/setup.typoscript
#	Documentation/Features/NewFields/Index.rst
#	Documentation/Settings.cfg
#	Resources/Public/JavaScript/Validation.min.js
#	config/sites/main/config.yaml
#	ext_emconf.php
#	ext_typoscript_setup.typoscript
#	readme.md
  • Loading branch information
sbusemann committed Dec 19, 2023
2 parents 9bab978 + 82c5573 commit 3dbc2a2
Show file tree
Hide file tree
Showing 6 changed files with 71 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .env
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
HOST=local.femanager.de
MAIL=mail.femanager.de
HOST=local.femanager7.de
MAIL=mail.femanager7.de

WEBROOT=.Build/Web
TYPO3_CACHE_DIR=var

SQLDUMPSDIR=.project/data/
SQLDUMPFILE=db.sql.gz
SQLPORT=22670
SQLPORT=22671

CHROMEPORT=15722
CHROMEPORT=15723

# Service names from docker-compose.yml to include in URL generation make target. Delimited by \|
SERVICELIST=mail
Expand Down
49 changes: 49 additions & 0 deletions Documentation/Changelog/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,55 @@ Changelog

* [BUGFIX] Notification email to admin now sends changes again
* [BUGFIX] Notification email to admin is also sent when adding recipient's address to flex form only
-
:Version: 7.2.3
:Date: 2023-12-13
:Changes:

* [SECURITY] This update is needed for version for 7.0.0 to 7.2.2 older versions are not affected
* BUGFIX] Dont use initilize actions for granting access - thx to Daniel Hofmann (in2code)

-
:Version: 7.2.2
:Date: 2023-10-04
:Changes:

* [SECURITY] This update is needed for version for 7.0.0 to 7.2.1 older versions are not affected
* [BUGFIX] Add missing permission check for invitation controller - thx to Daniel Hofmann (in2code)

-
:Version: 7.2.1
:Date: 2023-08-08
:Changes:

* [TASK] Adds documentation for extended - thx to Daniel Hofmann (in2code)
* [TASK] Update Image used for Github Actions
* [BUGFIX] Fixes reaction when no typoscript configuration is set for redirect - thx to Daniel Hofmann (in2code)
* [BUGFIX] Fixed Object Support for getDirtyPropertiesFromUser() - thx to Daniel Hofmann (in2code)

-
:Version: 7.2.0
:Date: 2023-07-17
:Changes:

* [FEATURE] Add column "inactive since" to backend list - thx to Thomas Löffler
* [BUGFIX] missing email AdminNotify after editing of user profile - thx to Christian Ludwig
* [BUGFIX] Do not re-evaluate object values in ServersideValidator - thx to Torben Hansen
* [BUGFIX] Add full object support in getDirtyPropertiesFromUser() - thx to Daniel Haupt
* [BUGFIX] Prevent undefined array key for empty configPID - thx to Daniel Haupt
* [BUGFIX] Migrate usage of GU::lcfirst with Rector - thx to Torben Hansen
* [TASK] Corrects Documenation Rendering Configuration - thx to Daniel Hoffmann
* [TASK] [TASK] Replace jQuery scrollTop with vanilla scrollIntoView - thx to Felix Ranesberger

-
:Version: 7.1.1
:Date: 2023-03-16
:Changes:

* [BUGFIX] Notification email to admin now sends changes again
* [BUGFIX] Notification email to admin is also sent when adding recipient's address to flex form only
* [TASK] Removes configPID from ext_typoscript_setup.typoscript

-
:Version: 7.1.0
:Date: 2023-01-19
Expand Down
3 changes: 3 additions & 0 deletions Resources/Private/Language/locallang.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@
<trans-unit id="tx_femanager_domain_model_user.lastlogin">
<source>Last login</source>
</trans-unit>
<trans-unit id="tx_femanager_domain_model_user.inactivesince">
<source>Inactive since</source>
</trans-unit>
<trans-unit id="tx_femanager_domain_model_user.crdate">
<source>Creation Time</source>
</trans-unit>
Expand Down
8 changes: 8 additions & 0 deletions Resources/Private/Templates/UserBackend/List.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@
<td nowrap="nowrap">
<f:translate key="tx_femanager_domain_model_user.lastlogin" />
</td>
<td nowrap="nowrap">
<f:translate key="tx_femanager_domain_model_user.inactivesince">
Inactive since
</f:translate>
</td>
<td nowrap="nowrap">
UID
</td>
Expand Down Expand Up @@ -117,6 +122,9 @@
<td nowrap="nowrap">
<f:format.date format="d.m.Y H:i">{user.lastlogin}</f:format.date>
</td>
<td nowrap="nowrap">
<f:format.date format="d.m.Y H:i">{user.inactiveSince}</f:format.date>
</td>
<td nowrap="nowrap">
{user.uid}
</td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Feature: SmallAdminConfirm
Then I should see "Thank you for your confirmation. Your profile will be available as soon as the admin confirms your request."

# Check if user is disabled
Given I am on "/index.php?id=48&pid=25"
Given I am on /index.php?id=48&pid=25"
Then I wait "4" seconds
Then I should see "[random:1]"
Then I should see "status: disabled"
Expand Down
6 changes: 6 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@
"typo3/cms-core": "^12.3.0",
"symfony/config": "^6.1"
},
"repositories": [
{
"type": "vcs",
"url": "https://github.com/in2code-de/femanagerextended.git"
}
],
"replace": {
"typo3-ter/femanager": "self.version"
},
Expand Down

0 comments on commit 3dbc2a2

Please sign in to comment.