bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2026-01-03 09:03:44 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into flexible-collections/deprecate-custom-collection-perm

Browse Source 
# Conflicts:
#	src/Api/Controllers/CollectionsController.cs
#	src/Api/Utilities/ServiceCollectionExtensions.cs
#	src/Api/Vault/AuthorizationHandlers/Collections/CollectionAuthorizationHandler.cs
#	src/Api/Vault/AuthorizationHandlers/Collections/CollectionOperations.cs
#	src/Core/Context/CurrentContext.cs
#	src/Core/Services/Implementations/CollectionService.cs
#	src/Core/Services/Implementations/OrganizationService.cs
#	test/Api.Test/Controllers/CollectionsControllerTests.cs
#	test/Api.Test/Vault/AuthorizationHandlers/CollectionAuthorizationHandlerTests.cs
#	test/Core.Test/Services/CollectionServiceTests.cs
This commit is contained in:
Rui Tome
2023-11-01 12:05:19 +00:00
parent 080d1088c4 da4a86c643
commit db19d143ed
36 changed files with 216 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Core/Constants.cs
View File

@@ -48,6 +48,7 @@ public static class FeatureFlagKeys
public const string FlexibleCollections = "flexible-collections";
public const string BulkCollectionAccess = "bulk-collection-access";
public const string AutofillOverlay = "autofill-overlay";
public const string ItemShare = "item-share";
public static List<string> GetAllKeys()
{