From 04a3d867483ed5bbd8544add2820dfae153998c0 Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Thu, 17 Jun 2021 16:50:31 +0200 Subject: [PATCH 1/4] bump version, prepare Changelog --- CHANGELOG.md | 10 ++++++++-- appinfo/info.xml | 2 +- sonar-project.properties | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26f88164..9ea14029 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). -## [Unreleased] - XXXX-XX-XX +## [2.6.1] - 2021-06-17 + +### Changed + +- Add shareExpire-param to indicate if a share was removed due to its expiry - [#944](https://github.com/owncloud/activity/issues/944) +- Automations in activity stream - [#942](https://github.com/owncloud/activity/issues/942) + ## [2.6.0] - 2020-10-16 @@ -117,7 +123,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - Show displayName instead of group id - [#582](https://github.com/owncloud/activity/issues/582) - Catch mail exceptions and still remove sent emails from queue - [#574](https://github.com/owncloud/activity/issues/574) -[Unreleased]: https://github.com/owncloud/activity/compare/v2.6.0...master +[2.6.1]: https://github.com/owncloud/activity/compare/v2.6.0...v2.6.1 [2.6.0]: https://github.com/owncloud/activity/compare/v2.5.4...v2.6.0 [2.5.4]: https://github.com/owncloud/activity/compare/v2.5.3...v2.5.4 [2.5.3]: https://github.com/owncloud/activity/compare/v2.5.2...v2.5.3 diff --git a/appinfo/info.xml b/appinfo/info.xml index 765e815b..ec7fbb58 100755 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -15,7 +15,7 @@ Never again miss an important event related to content in ownCloud and always be AGPL Thomas Müller, Frank Karlitschek, Joas Schilling, Tom Needham, Vincent Petry - 2.6.0 + 2.6.1 diff --git a/sonar-project.properties b/sonar-project.properties index 936139ca..aeb7208f 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,7 +1,7 @@ # Organization and project keys are displayed in the right sidebar of the project homepage sonar.organization=owncloud-1 sonar.projectKey=owncloud_activity -sonar.projectVersion=1.0 +sonar.projectVersion=2.6.1 sonar.host.url=https://sonarcloud.io # ===================================================== From 949f03b1a17c5993b4dd100dcc402c20fa0b0da9 Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Mon, 21 Jun 2021 14:15:32 +0200 Subject: [PATCH 2/4] bump min-version --- appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index ec7fbb58..a1b79842 100755 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -30,7 +30,7 @@ Never again miss an important event related to content in ownCloud and always be https://raw.githubusercontent.com/owncloud/screenshots/68550c2b7c53e6309132ca1c7b177adca976db0b/activity/activity.png tools - + OCA\Activity\BackgroundJob\EmailNotification From 5f3bf8b55765bbc0596e22accfee39de445cfe48 Mon Sep 17 00:00:00 2001 From: Jannik Stehle Date: Mon, 21 Jun 2021 16:18:35 +0200 Subject: [PATCH 3/4] Fix check for expired public links --- CHANGELOG.md | 3 +++ lib/FilesHooks.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ea14029..48e2a616 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - Add shareExpire-param to indicate if a share was removed due to its expiry - [#944](https://github.com/owncloud/activity/issues/944) - Automations in activity stream - [#942](https://github.com/owncloud/activity/issues/942) +### Fixed + +- Expired public share has wrong activity message - [#965](https://github.com/owncloud/activity/issues/965) ## [2.6.0] - 2020-10-16 diff --git a/lib/FilesHooks.php b/lib/FilesHooks.php index 848c9bb6..2dc95fcd 100755 --- a/lib/FilesHooks.php +++ b/lib/FilesHooks.php @@ -436,7 +436,7 @@ protected function shareFileOrFolderByLink($fileSource, $itemType, $linkOwner, $ if ($isSharing) { $actionSharer = 'shared_link_self'; $actionOwner = 'reshared_link_by'; - } elseif ($this->currentUser !== $linkOwner) { + } elseif ($shareExpired === true) { // Link expired $actionSharer = 'link_expired'; $actionOwner = 'link_by_expired'; From ab92a1324ae948403e87457dc42d1c5edc5ae3b5 Mon Sep 17 00:00:00 2001 From: Juergen Weigert Date: Thu, 24 Jun 2021 16:56:05 +0200 Subject: [PATCH 4/4] prepare merge back --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48e2a616..d5dc848b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). +## [Unreleased] - XXXX-XX-XX + + + ## [2.6.1] - 2021-06-17 ### Changed @@ -15,6 +19,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - Expired public share has wrong activity message - [#965](https://github.com/owncloud/activity/issues/965) + ## [2.6.0] - 2020-10-16 ### Added @@ -126,6 +131,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - Show displayName instead of group id - [#582](https://github.com/owncloud/activity/issues/582) - Catch mail exceptions and still remove sent emails from queue - [#574](https://github.com/owncloud/activity/issues/574) + +[Unreleased]: https://github.com/owncloud/activity/compare/v2.6.1...master [2.6.1]: https://github.com/owncloud/activity/compare/v2.6.0...v2.6.1 [2.6.0]: https://github.com/owncloud/activity/compare/v2.5.4...v2.6.0 [2.5.4]: https://github.com/owncloud/activity/compare/v2.5.3...v2.5.4