Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/groupfolders.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2020-04-06 12:14:44 +0300
committerGitHub <noreply@github.com>2020-04-06 12:14:44 +0300
commit22888a6a12edd8e992091507c58104525cc3ba68 (patch)
treea98cdaf7c6d42edb4c2a951451c5d35b7291b8ca
parentc097a5d5b7af713309444f8e85fa4356135605ad (diff)
parentbd3af6ff7e2993d6040844ebc19763745dba7095 (diff)
Merge pull request #854 from nextcloud/release/6.0.4v6.0.4
Bump version to 6.0.4
-rw-r--r--CHANGELOG.md7
-rw-r--r--appinfo/info.xml2
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58f3d2c7..413d46fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 6.0.4
+
+- Check ACL before restoring files from the trashbin
+- Do not allow restoring files at an existing target
+- Return the mountpoint owner as a fallback
+- Bump dependencies
+
## 6.0.3
- Do not ship unneeded files with the release
diff --git a/appinfo/info.xml b/appinfo/info.xml
index c0b4a031..a15f35e2 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -10,7 +10,7 @@ Folders can be configured from *Group folders* in the admin settings.
After a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.
Note: encrypting the contents of group folders is currently not supported.]]></description>
- <version>6.0.3</version>
+ <version>6.0.4</version>
<licence>agpl</licence>
<author>Robin Appelman</author>
<namespace>GroupFolders</namespace>