diff options
| author | Carl Schwan <carl@carlschwan.eu> | 2022-06-22 22:27:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-22 22:27:30 +0300 |
| commit | bad8d250d75a484bd389ccaf92d0eb665bdc0469 (patch) | |
| tree | 793cad43e96ebc3804b5ba8f60457290f093c5dd | |
| parent | 0e629e74f4bc976befb288d04620ca228a4307d8 (diff) | |
| parent | 2a340a632d3e68a413cc125c26fa920d1992f72b (diff) | |
Merge pull request #2033 from nextcloud/release/v11.1.5v11.1.5
Release 11.1.5
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | appinfo/info.xml | 2 | ||||
| -rw-r--r-- | lib/Mount/CacheRootPermissionsMask.php | 2 | ||||
| -rw-r--r-- | lib/Mount/MountProvider.php | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index b32dd113..6eac2ef9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 11.1.5 + +- Display group names in occ output +- Allow disabling sharing of groupfolder root +- Speedup getting the list of groups in the admin interface + ## 11.1.4 Publish the previous release correctly diff --git a/appinfo/info.xml b/appinfo/info.xml index d09a9251..034d06f6 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>11.1.4</version> + <version>11.1.5</version> <licence>agpl</licence> <author>Robin Appelman</author> <namespace>GroupFolders</namespace> diff --git a/lib/Mount/CacheRootPermissionsMask.php b/lib/Mount/CacheRootPermissionsMask.php index 2c0b83b6..55c43b07 100644 --- a/lib/Mount/CacheRootPermissionsMask.php +++ b/lib/Mount/CacheRootPermissionsMask.php @@ -27,7 +27,7 @@ use OC\Files\Cache\Wrapper\CacheWrapper; use OCP\Files\Cache\ICache; class CacheRootPermissionsMask extends CacheWrapper { - protected int $mask; + protected $mask; public function __construct(ICache $cache, int $mask) { parent::__construct($cache); diff --git a/lib/Mount/MountProvider.php b/lib/Mount/MountProvider.php index 94400031..b0cff63d 100644 --- a/lib/Mount/MountProvider.php +++ b/lib/Mount/MountProvider.php @@ -67,7 +67,7 @@ class MountProvider implements IMountProvider { private $mountProviderCollection; private $connection; - private bool $allowRootShare; + private $allowRootShare; public function __construct( IGroupManager $groupProvider, |