Rui Tome 9c5f580035 Merge branch 'feature/flexible-collections' into flexible-collections/deprecate-custom-collection-perm ...

# Conflicts:
#	src/Api/AdminConsole/Controllers/OrganizationUsersController.cs
#	src/Core/Context/CurrentContext.cs

2023-10-27 15:06:13 +01:00

..

AdminConsole

[AC-1200] Admin Console code ownership - move OrganizationFeatures (#3369)

2023-10-26 16:47:44 -05:00

Auth

PM-3925 - Tech Debt - Add missed tests for SSO Email 2FA Tokenable (#3270)

2023-09-15 14:54:52 -04:00

AutoFixture

Merge remote-tracking branch 'origin/master' into feature/flexible-collections

2023-10-23 08:47:11 +10:00

Entities

[AC-1201] refactor: move all SCIM related files into the AdminConsole scope (#2841)

2023-04-19 09:31:00 +10:00

Helpers

Run formatting (#2230)

2022-08-29 16:06:55 -04:00

Models

[AC-1568] Refactor UpdateSecretsManagerSubscriptionCommandTests to use new ctor (#3210)

2023-08-22 09:55:39 +10:00

OrganizationFeatures

Merge remote-tracking branch 'origin/master' into feature/flexible-collections

2023-10-27 13:23:55 +10:00

Resources

Run formatting (#2230)

2022-08-29 16:06:55 -04:00

SecretsManager/AutoFixture

[AC-1512] Feature: Secrets Manager Billing - round 2 (#3119)

2023-08-04 21:51:12 +00:00

Services

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

2023-10-27 15:06:13 +01:00

Tokens

Run formatting (#2230)

2022-08-29 16:06:55 -04:00

Tools

[PM-1969] Spellcheck other (#2878)

2023-05-17 12:14:36 +02:00

Utilities

Merge remote-tracking branch 'origin/master' into feature/flexible-collections

2023-10-27 13:23:55 +10:00

Vault

Fix: add missing namespace after merging in master

2023-10-24 11:42:04 +10:00

Core.Test.csproj

Remove moq (#3166)

2023-08-10 17:03:42 +02:00

packages.lock.json

[PM-2961] Upgrade Braintree (#3206)

2023-09-20 14:11:29 -04:00

TempDirectory.cs

Run formatting (#2230)

2022-08-29 16:06:55 -04:00