]>
source.dussan.org Git - nextcloud-server.git/log
Robin Appelman [Wed, 2 Oct 2024 15:00:53 +0000 (17:00 +0200)]
test: add test for nested jail cross-storage move
Signed-off-by: Robin Appelman <robin@icewind.nl>
Daniel Calviño Sánchez [Mon, 9 Sep 2024 11:07:14 +0000 (13:07 +0200)]
fix: Fix copying or moving from shared groupfolders
When copying or moving between two local storages the source path (on
disk) to copy or move from is got from the unjailed path of the source
storage. However, if the source storage has more than one jail getting
the unjailed path resolves the most external jail, but the source path
needs to be got from the most internal jail instead (the one closer to
the local storage).
This can happen, for example, with a shared groupfolder: in that case
there is an external jail for the shared storage, and one internal jail
for the groupfolder storage wrapped by the shared storage.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Nextcloud bot [Thu, 10 Oct 2024 00:20:15 +0000 (00:20 +0000)]
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Louis [Wed, 9 Oct 2024 19:58:44 +0000 (21:58 +0200)]
Merge pull request #48536 from nextcloud/artonge/fix/vue_app_names
fix: Vue app names
Louis Chemineau [Thu, 3 Oct 2024 13:06:05 +0000 (15:06 +0200)]
chore: Compile assets
Signed-off-by: Louis Chemineau <louis@chmn.me>
Louis Chemineau [Thu, 3 Oct 2024 13:02:47 +0000 (15:02 +0200)]
fix: Minor @nc/vue usage errors
Signed-off-by: Louis Chemineau <louis@chmn.me>
Louis Chemineau [Thu, 3 Oct 2024 13:02:44 +0000 (15:02 +0200)]
fix: Vue app names
This improves the debugging experience in the vue dev tool.
Signed-off-by: Louis Chemineau <louis@chmn.me>
Kate [Wed, 9 Oct 2024 16:39:42 +0000 (18:39 +0200)]
Merge pull request #48623 from nextcloud/fix/allow-quota-wrapper-check
Kate [Wed, 9 Oct 2024 15:32:40 +0000 (17:32 +0200)]
Merge pull request #48628 from nextcloud/fix/public-get
Ferdinand Thiessen [Tue, 8 Oct 2024 21:51:38 +0000 (23:51 +0200)]
fix(dav): Public WebDAV endpoint should allow `GET` requests
`GET` should be allowed even without Ajax header to allow downloading files,
or show files in the viewer. All other requests could be guarded, but this should not.
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Joas Schilling [Wed, 9 Oct 2024 10:10:41 +0000 (12:10 +0200)]
Merge pull request #48605 from nextcloud/dependabot/composer/guzzlehttp/guzzle-7.9.2
chore(deps): Bump guzzlehttp/guzzle from 7.8.1 to 7.9.2
Pytal [Wed, 9 Oct 2024 08:58:52 +0000 (01:58 -0700)]
Merge pull request #48619 from nextcloud/fix/unified-search-empty-sections
fix: Fix empty sections appearing in search results
Joas Schilling [Mon, 7 Oct 2024 21:01:37 +0000 (23:01 +0200)]
chore(deps): Bump guzzlehttp/guzzle from 7.8.1 to 7.9.2
Signed-off-by: Joas Schilling <coding@schilljs.com>
Julius Knorr [Wed, 9 Oct 2024 06:25:30 +0000 (08:25 +0200)]
fix: Allow overriding shouldApplyQuota check from child classes
Signed-off-by: Julius Knorr <jus@bitgrid.net>
Pytal [Wed, 9 Oct 2024 00:48:21 +0000 (17:48 -0700)]
Merge pull request #48538 from nextcloud/fix/get-managers-as-subadmin
fix: Return correct list of managers for a user
Nextcloud bot [Wed, 9 Oct 2024 00:20:13 +0000 (00:20 +0000)]
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Christopher Ng [Tue, 8 Oct 2024 23:44:06 +0000 (16:44 -0700)]
test: Fix tests
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Christopher Ng [Fri, 4 Oct 2024 23:28:23 +0000 (16:28 -0700)]
refactor: Clean up
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Christopher Ng [Fri, 4 Oct 2024 23:28:23 +0000 (16:28 -0700)]
fix: Return correct list of managers for a user
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Christopher Ng [Fri, 4 Oct 2024 23:28:23 +0000 (16:28 -0700)]
fix: Subadmin can access self
Signed-off-by: Christopher Ng <chrng8@gmail.com>
F. E Noel Nfebe [Tue, 8 Oct 2024 19:02:38 +0000 (21:02 +0200)]
Merge pull request #48520 from nextcloud/chore/48409/replace-diaspora-and-twitter
chore: Replace Twitter & Diaspora links and text
Christopher Ng [Tue, 8 Oct 2024 17:45:27 +0000 (10:45 -0700)]
fix: Fix empty sections appearing in search results
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Côme Chilliet [Tue, 8 Oct 2024 15:31:53 +0000 (17:31 +0200)]
Merge pull request #48597 from nextcloud/fix/fix-email-share-transfer-accross-storages
Fix email share transfer accross storages
Côme Chilliet [Tue, 8 Oct 2024 14:53:51 +0000 (16:53 +0200)]
fix(tests): Fix sharebymail tests
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Kate [Tue, 8 Oct 2024 14:53:26 +0000 (16:53 +0200)]
Merge pull request #48610 from nextcloud/fix/usertrait/backend-initialization
Côme Chilliet [Tue, 8 Oct 2024 14:29:03 +0000 (16:29 +0200)]
Merge pull request #48613 from nextcloud/feat/add-query-param-to-force-language
feat(l10n): Allow to force language with a query parameter
Côme Chilliet [Tue, 8 Oct 2024 13:40:40 +0000 (15:40 +0200)]
feat(l10n): Respect forceLanguage query parameter in more places
Attempt to make L10N Factory consistent with itself when forceLanguage
query parameter is used.
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Kate [Tue, 8 Oct 2024 13:20:17 +0000 (15:20 +0200)]
Merge pull request #48494 from nextcloud/refactor/storage/strong-param-types
Côme Chilliet [Tue, 8 Oct 2024 12:44:03 +0000 (14:44 +0200)]
feat(l10n): Allow to force language with a query parameter
This will be used by support application to always generate the support
report in english. It may also be used to debug a language, or to
temporarily show a page in an other language to take a screenshot or to
share your screen with someone speaking another language.
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
nextcloud-command [Mon, 7 Oct 2024 18:54:54 +0000 (18:54 +0000)]
chore(assets): Recompile assets
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
Ferdinand Thiessen [Mon, 7 Oct 2024 16:32:35 +0000 (18:32 +0200)]
fix(federatedfilesharing): Use valid mastodon URL for sharing
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Ferdinand Thiessen [Mon, 7 Oct 2024 16:27:23 +0000 (18:27 +0200)]
fix(federatedfilesharing): Add aria label to include the `X` in `X (formerly Twitter)` button.
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Ferdinand Thiessen [Mon, 7 Oct 2024 16:19:34 +0000 (18:19 +0200)]
refactor(federatedfilessharing): Make copy logic more resilient and use Typescript
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Ferdinand Thiessen [Mon, 7 Oct 2024 16:17:55 +0000 (18:17 +0200)]
fix(federatedfilessharing): Use social media icons from core rather than inline SVGs
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Ferdinand Thiessen [Mon, 7 Oct 2024 16:15:49 +0000 (18:15 +0200)]
feat(core): Add correct X logo as provided by X Corp.
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Ferdinand Thiessen [Mon, 7 Oct 2024 16:14:50 +0000 (18:14 +0200)]
fix(core): Use correct facebook icon provided by Meta
The legal terms require to exactly use the facebook logo as provided by Meta.
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
fenn-cs [Wed, 2 Oct 2024 09:35:13 +0000 (11:35 +0200)]
chore: Replace Twitter & Diaspora links and text
- Use Twitters new name "X"
- Remove Diaspora social and include Mastodon instead
Resolves : https://github.com/nextcloud/server/issues/48409
Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
Joas Schilling [Tue, 8 Oct 2024 11:49:53 +0000 (13:49 +0200)]
Merge pull request #48603 from nextcloud/bugfix/noid/censor-more-values
fix(logger): Remove more parameters of other methods
Kate [Tue, 8 Oct 2024 10:25:53 +0000 (12:25 +0200)]
Merge pull request #48600 from nextcloud/fix/backgroundjobs/adjust-intervals-time-sensitivities
provokateurin [Mon, 7 Oct 2024 15:37:38 +0000 (17:37 +0200)]
feat(TimedJob): Add debug log about time sensitive jobs with long intervals
Signed-off-by: provokateurin <kate@provokateurin.de>
provokateurin [Mon, 7 Oct 2024 15:36:55 +0000 (17:36 +0200)]
fix(BackgroundJobs): Adjust intervals and time sensitivities
Signed-off-by: provokateurin <kate@provokateurin.de>
provokateurin [Tue, 8 Oct 2024 09:12:01 +0000 (11:12 +0200)]
fix(UserTrait): Fix backend initialization
Signed-off-by: provokateurin <kate@provokateurin.de>
Nextcloud bot [Tue, 8 Oct 2024 00:20:08 +0000 (00:20 +0000)]
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Joas Schilling [Mon, 7 Oct 2024 19:04:49 +0000 (21:04 +0200)]
fix(logger): Remove more parameters of other methods
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Mon, 7 Oct 2024 15:29:44 +0000 (17:29 +0200)]
Merge pull request #48592 from nextcloud/dependabot/composer/doctrine/dbal-3.9.x
build: Update doctrine/dbal from 3.8.x to 3.9.1
Joas Schilling [Mon, 7 Oct 2024 11:16:54 +0000 (13:16 +0200)]
build: Update doctrine/dbal from 3.8.x to 3.9.1
Signed-off-by: Joas Schilling <coding@schilljs.com>
F. E Noel Nfebe [Mon, 7 Oct 2024 14:19:36 +0000 (16:19 +0200)]
Merge pull request #46691 from nextcloud/fix-show-original-owner
feat(sidebar): Show node owner in metadata subline
Côme Chilliet [Mon, 7 Oct 2024 13:36:53 +0000 (15:36 +0200)]
fix(sharebymail): Fix share update when node id changed
This fixes transfering an email share from a user to another one when using
objectstore as primary storage.
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Côme Chilliet [Mon, 7 Oct 2024 13:35:47 +0000 (15:35 +0200)]
feat(transfer-ownership): Improve verbose output of command
Makes debbuging way easier
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
nextcloud-command [Mon, 7 Oct 2024 13:22:35 +0000 (13:22 +0000)]
chore(assets): Recompile assets
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
fenn-cs [Mon, 22 Jul 2024 16:54:39 +0000 (17:54 +0100)]
feat(sidebar): Show node owner in metadata subline
Resolves: https://github.com/nextcloud/server/issues/46178
Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
provokateurin [Tue, 1 Oct 2024 14:14:28 +0000 (16:14 +0200)]
refactor(files_external): Add Storage parameter strong types
Signed-off-by: provokateurin <kate@provokateurin.de>
provokateurin [Tue, 1 Oct 2024 14:14:13 +0000 (16:14 +0200)]
refactor(files_sharing): Add Storage parameter strong types
Signed-off-by: provokateurin <kate@provokateurin.de>
provokateurin [Tue, 1 Oct 2024 14:14:04 +0000 (16:14 +0200)]
refactor(files_trashbin): Add Storage parameter strong types
Signed-off-by: provokateurin <kate@provokateurin.de>
provokateurin [Tue, 1 Oct 2024 14:14:48 +0000 (16:14 +0200)]
refactor(dav): Add Storage parameter strong types
Signed-off-by: provokateurin <kate@provokateurin.de>
provokateurin [Tue, 1 Oct 2024 14:13:51 +0000 (16:13 +0200)]
test(workflowengine): Add Storage parameter strong types
Signed-off-by: provokateurin <kate@provokateurin.de>
provokateurin [Tue, 1 Oct 2024 14:12:30 +0000 (16:12 +0200)]
refactor(Storage): Make all parameter types strong types
Signed-off-by: provokateurin <kate@provokateurin.de>
Kate [Mon, 7 Oct 2024 12:37:25 +0000 (14:37 +0200)]
Merge pull request #48487 from nextcloud/refactor/stream-encryption/typings
provokateurin [Tue, 1 Oct 2024 13:55:36 +0000 (15:55 +0200)]
refactor(Wrapper\Encryption): Migrate to strong types
Signed-off-by: provokateurin <kate@provokateurin.de>
provokateurin [Tue, 1 Oct 2024 13:07:36 +0000 (15:07 +0200)]
refactor(Stream\Encryption): Migrate to strong types
Signed-off-by: provokateurin <kate@provokateurin.de>
Ferdinand Thiessen [Mon, 7 Oct 2024 11:14:23 +0000 (13:14 +0200)]
Merge pull request #48584 from nextcloud/bugfix/noid/increase-exclude-list
fix(config): Mark more app configs sensitive
Joas Schilling [Mon, 7 Oct 2024 11:08:42 +0000 (13:08 +0200)]
Merge pull request #48539 from nextcloud/dependabot/composer/symfony-6.4
build: Bump symfony/* to 6.4
Joas Schilling [Fri, 4 Oct 2024 14:24:22 +0000 (16:24 +0200)]
test(settings): Correctly only return bool for Symfony Input::hasParameterOption calls
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Fri, 4 Oct 2024 14:13:28 +0000 (16:13 +0200)]
fix(message): Fix logic of Mail test
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Wed, 2 Oct 2024 22:28:22 +0000 (00:28 +0200)]
fix: Ensure we only pass string to writeln()
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Wed, 2 Oct 2024 22:28:07 +0000 (00:28 +0200)]
test: Fix wrongly mocked method
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Wed, 2 Oct 2024 22:27:52 +0000 (00:27 +0200)]
test: Fix mock creation
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Wed, 2 Oct 2024 21:58:31 +0000 (23:58 +0200)]
ci: Fix psalm by typing the QuestionHelper
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Wed, 2 Oct 2024 21:58:01 +0000 (23:58 +0200)]
ci: Update psalm-baseline
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Wed, 2 Oct 2024 21:41:44 +0000 (23:41 +0200)]
fix(command): Make method compatible with upstream class (requires 3rdparty bump)
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Wed, 2 Oct 2024 21:38:05 +0000 (23:38 +0200)]
fix(command): Make method compatible with upstream class (backportable)
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Wed, 2 Oct 2024 21:18:52 +0000 (23:18 +0200)]
build: Bump symfony/* to 6.4
Signed-off-by: Joas Schilling <coding@schilljs.com>
Ferdinand Thiessen [Mon, 7 Oct 2024 09:58:34 +0000 (11:58 +0200)]
Merge pull request #48438 from nextcloud/fix/bring-back-zip-event
fix(dav): Emit `BeforeZipCreatedEvent` when creating folder zip archive
Ferdinand Thiessen [Mon, 7 Oct 2024 09:33:07 +0000 (11:33 +0200)]
Merge pull request #47896 from nextcloud/fix/resiliant-user-removal
fix: Make user removal more resilient
Joas Schilling [Mon, 7 Oct 2024 08:58:03 +0000 (10:58 +0200)]
fix(config): Mark more app configs sensitive
Signed-off-by: Joas Schilling <coding@schilljs.com>
Nextcloud bot [Mon, 7 Oct 2024 00:19:56 +0000 (00:19 +0000)]
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Nextcloud bot [Sun, 6 Oct 2024 00:21:20 +0000 (00:21 +0000)]
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
dependabot[bot] [Sat, 5 Oct 2024 06:21:23 +0000 (06:21 +0000)]
Merge pull request #48574 from nextcloud/dependabot/npm_and_yarn/dompurify-3.1.7
nextcloud-command [Sat, 5 Oct 2024 06:11:26 +0000 (06:11 +0000)]
chore(assets): Recompile assets
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
dependabot[bot] [Sat, 5 Oct 2024 02:29:46 +0000 (02:29 +0000)]
Merge pull request #48576 from nextcloud/dependabot/npm_and_yarn/babel/plugin-transform-private-methods-7.25.7
dependabot[bot] [Sat, 5 Oct 2024 02:16:21 +0000 (02:16 +0000)]
chore(deps-dev): Bump @babel/plugin-transform-private-methods
Bumps [@babel/plugin-transform-private-methods](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-private-methods) from 7.25.4 to 7.25.7.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.25.7/packages/babel-plugin-transform-private-methods)
---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-private-methods"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
dependabot[bot] [Sat, 5 Oct 2024 02:14:50 +0000 (02:14 +0000)]
Merge pull request #48573 from nextcloud/dependabot/npm_and_yarn/babel/node-7.25.7
dependabot[bot] [Sat, 5 Oct 2024 01:23:03 +0000 (01:23 +0000)]
chore(deps): Bump dompurify from 3.1.6 to 3.1.7
Bumps [dompurify](https://github.com/cure53/DOMPurify) from 3.1.6 to 3.1.7.
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](https://github.com/cure53/DOMPurify/compare/3.1.6...3.1.7)
---
updated-dependencies:
- dependency-name: dompurify
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
dependabot[bot] [Sat, 5 Oct 2024 01:22:44 +0000 (01:22 +0000)]
chore(deps-dev): Bump @babel/node from 7.25.0 to 7.25.7
Bumps [@babel/node](https://github.com/babel/babel/tree/HEAD/packages/babel-node) from 7.25.0 to 7.25.7.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.25.7/packages/babel-node)
---
updated-dependencies:
- dependency-name: "@babel/node"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Nextcloud bot [Sat, 5 Oct 2024 00:20:17 +0000 (00:20 +0000)]
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Arthur Schiwon [Fri, 4 Oct 2024 18:03:18 +0000 (20:03 +0200)]
Merge pull request #48532 from nextcloud/fix/48437/dont-exclude-user
fix: do not reduce count for subadmins if they are members of group
Robin Appelman [Fri, 4 Oct 2024 14:43:21 +0000 (16:43 +0200)]
Merge pull request #48421 from nextcloud/smb-systembridge
fix: use nc's binary finding logic for smb
Robin Appelman [Fri, 27 Sep 2024 13:41:26 +0000 (15:41 +0200)]
fix: use nc's binary finding logic for smb
Signed-off-by: Robin Appelman <robin@icewind.nl>
Nextcloud bot [Fri, 4 Oct 2024 00:20:04 +0000 (00:20 +0000)]
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Ferdinand Thiessen [Thu, 3 Oct 2024 17:04:30 +0000 (19:04 +0200)]
Merge pull request #48440 from nextcloud/refactor/background-service
refactor(theming): Reduce duplicated code in `BackgroundService`
Kate [Thu, 3 Oct 2024 13:48:10 +0000 (15:48 +0200)]
Merge pull request #48522 from nextcloud/fix/querybuilder/output-columns-aliases
Pytal [Thu, 3 Oct 2024 12:28:24 +0000 (05:28 -0700)]
Merge pull request #48543 from nextcloud/fix/themes-layout
fix(theming): Fix layout of themes
Côme Chilliet [Thu, 3 Oct 2024 12:07:55 +0000 (14:07 +0200)]
Merge pull request #48548 from nextcloud/fix/fix-admin-audit-event-listening
fix(admin_audit): Listen to the right events
Joas Schilling [Thu, 3 Oct 2024 10:28:12 +0000 (12:28 +0200)]
Merge pull request #48540 from nextcloud/bugfix/noid/remove-3rdparty-use
fix(filesexternal): Remove unneeded 3rdparty library use
Côme Chilliet [Thu, 3 Oct 2024 08:56:42 +0000 (10:56 +0200)]
fix(admin_audit): Listen to the right events
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Nextcloud bot [Thu, 3 Oct 2024 00:20:34 +0000 (00:20 +0000)]
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
nextcloud-command [Wed, 2 Oct 2024 23:29:56 +0000 (23:29 +0000)]
chore(assets): Recompile assets
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
Christopher Ng [Wed, 2 Oct 2024 23:13:43 +0000 (16:13 -0700)]
fix(theming): Fix layout of themes
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Joas Schilling [Wed, 2 Oct 2024 21:27:44 +0000 (23:27 +0200)]
fix(filesexternal): Remove unneeded 3rdparty library use
Signed-off-by: Joas Schilling <coding@schilljs.com>
Maksim Sukharev [Wed, 2 Oct 2024 13:25:19 +0000 (15:25 +0200)]
fix: do not reduce count for subadmins if they are members of group
Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>