Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AC-108] Enterprise policies are not removed when downgraded to teams #3014

Commits on Jun 13, 2023

  1. [AC-108] Added filter to OrganizationUserRepository.GetByUserIdWithPo…

    …licyDetailsAsync to only output policies for Organizations that have UsePolicies = true
    r-tome committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    cac7518 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    30fb399 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    22336c2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ab16c98 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    7b43e85 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

  1. [AC-1423] Add AddonProduct and BitwardenProduct properties to Billing…

    …SubscriptionItem (#3037)
    
    * [AC-1423] Add AddonProduct and BitwardenProduct properties to BillingSubscriptionItem
    
    - Add a helper method to determine the appropriate addon type based on the subscription items StripeId
    
    * [AC-1423] Add helper to StaticStore.cs to find a Plan by StripePlanId
    
    * [AC-1423] Use the helper method to set SubscriptionInfo.BitwardenProduct
    shane-melton authored Jun 29, 2023
    Configuration menu
    Copy the full SHA
    fd51797 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    039e216 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    12e6696 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2023

  1. [AC 1409] Secrets Manager Subscription Stripe Integration (#3019)

    * Adding the Secret manager to the Plan List
    
    * Adding the unit test for the StaticStoreTests class
    
    * Fix whitespace formatting
    
    * Fix whitespace formatting
    
    * Price update
    
    * Resolving the PR comments
    
    * Resolving PR comments
    
    * Fixing the whitespace
    
    * only password manager plans are return for now
    
    * format whitespace
    
    * Resolve the test issue
    
    * Fixing the failing test
    
    * Refactoring the Plan separation
    
    * add a unit test for SingleOrDefault
    
    * Fix the whitespace format
    
    * Separate the PM and SM plans
    
    * Fixing the whitespace
    
    * Remove unnecessary directive
    
    * Fix imports ordering
    
    * Fix imports ordering
    
    * Resolve imports ordering
    
    * Fixing imports ordering
    
    * Fix response model, add MaxProjects
    
    * Fix filename
    
    * Fix format
    
    * Fix: seat price should match annual/monthly
    
    * Fix service account annual pricing
    
    * Changes for secret manager signup and upgradeplan
    
    * Changes for secrets manager signup and upgrade
    
    * refactoring the code
    
    * Format whitespace
    
    * remove unnecessary using directive
    
    * Resolve the PR comment on Subscription creation
    
    * Resolve PR comment
    
    * Add password manager to the error message
    
    * Add UseSecretsManager to the event log
    
    * Resolve PR comment on plan validation
    
    * Resolving pr comments for service account count
    
    * Resolving pr comments for service account count
    
    * Resolve the pr comments
    
    * Remove the store procedure that is no-longer needed
    
    * Rename a property properly
    
    * Resolving the PR comment
    
    * Resolve PR comments
    
    * Resolving PR comments
    
    * Resolving the Pr comments
    
    * Resolving some PR comments
    
    * Resolving the PR comments
    
    * Resolving the build identity build
    
    * Add additional Validation
    
    * Resolve the Lint issues
    
    * remove unnecessary using directive
    
    * Remove the white spaces
    
    * Adding unit test for the stripe payment
    
    * Remove the incomplete test
    
    * Fixing the failing test
    
    * Fix the failing test
    
    * Fix the fail test on organization service
    
    * Fix the failing unit test
    
    * Fix the whitespace format
    
    * Fix the failing test
    
    * Fix the whitespace format
    
    * resolve pr comments
    
    * Fix the lint message
    
    * Resolve the PR comments
    
    * resolve pr comments
    
    * Resolve pr comments
    
    * Resolve the pr comments
    
    * remove unused code
    
    * Added for sm validation test
    
    * Fix the whitespace format issues
    
    ---------
    
    Co-authored-by: Thomas Rittson <[email protected]>
    Co-authored-by: Thomas Rittson <[email protected]>
    3 people authored Jul 1, 2023
    Configuration menu
    Copy the full SHA
    46b2260 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2023

  1. Configuration menu
    Copy the full SHA
    9062672 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    66185f0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c9745cd View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f00f552 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    6c0c9c6 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2023

  1. Configuration menu
    Copy the full SHA
    6a5d5a9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4a88894 View commit details
    Browse the repository at this point in the history
  3. [AC 1460] Update Stripe Configuration (#3070)

    * change the stripeseat id
    
    * change service accountId to align with new product
    
    * make all the Id name for consistent
    cyprain-okeke authored Jul 4, 2023
    Configuration menu
    Copy the full SHA
    692c7ff View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2023

  1. Configuration menu
    Copy the full SHA
    45b6954 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2023

  1. SM-802: Move SecretsManagerBeta from OrganizationResponseModel to Org…

    …anizationSubscriptionResponseModel. Use sp_refreshview instead of sp_refreshsqlmodule in the migration script.
    coltonhurst committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    9cc1774 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2a441c1 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

  1. [AC 1410] Secrets Manager subscription adjustment back-end changes (#…

    …3036)
    
    * Create UpgradeSecretsManagerSubscription command
    
    ---------
    
    Co-authored-by: Thomas Rittson <[email protected]>
    cyprain-okeke and eliykat authored Jul 10, 2023
    Configuration menu
    Copy the full SHA
    a1f8ca8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ce03d38 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2cc3fcd View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    88338a9 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    052b61e View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    d5682ce View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. [AC-1495] Extract UpgradePlanAsync into a command (#3081)

    * This is a pure lift & shift with no refactors
    
    * Only register subscription commands in Api
    
    ---------
    
    Co-authored-by: cyprain-okeke <[email protected]>
    eliykat and cyprain-okeke authored Jul 11, 2023
    Configuration menu
    Copy the full SHA
    a5efec3 View commit details
    Browse the repository at this point in the history
  2. [AC-1503] Fix Stripe integration on organization upgrade (#3084)

    * Fix SM parameters not being passed to Stripe
    
    * Fix flaky test
    
    * Fix error message
    eliykat authored Jul 11, 2023
    Configuration menu
    Copy the full SHA
    cab23cb View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3a6b17b View commit details
    Browse the repository at this point in the history
  4. [AC-1488] Changed SM Signup and Upgrade paths to set SmServiceAccount…

    …s to include the plan BaseServiceAccount (#3086)
    r-tome authored Jul 11, 2023
    Configuration menu
    Copy the full SHA
    3ea14a2 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    0ec3020 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. Configuration menu
    Copy the full SHA
    38ff569 View commit details
    Browse the repository at this point in the history
  2. Revert changes to ReferenceEvent code (#3091)

    * Revert changes to ReferenceEvent code
    
    This will be done in AC-1481
    eliykat authored Jul 12, 2023
    Configuration menu
    Copy the full SHA
    e1bede1 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2023

  1. Configuration menu
    Copy the full SHA
    b14c383 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    aa5c200 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a9dcc32 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f714744 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2023

  1. Configuration menu
    Copy the full SHA
    99b598a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a79a523 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

  1. [AC-1462] Add secrets manager service accounts autoscaling commands (#…

    …3059)
    
    * Adding the Secret manager to the Plan List
    
    * Adding the unit test for the StaticStoreTests class
    
    * Fix whitespace formatting
    
    * Fix whitespace formatting
    
    * Price update
    
    * Resolving the PR comments
    
    * Resolving PR comments
    
    * Fixing the whitespace
    
    * only password manager plans are return for now
    
    * format whitespace
    
    * Resolve the test issue
    
    * Fixing the failing test
    
    * Refactoring the Plan separation
    
    * add a unit test for SingleOrDefault
    
    * Fix the whitespace format
    
    * Separate the PM and SM plans
    
    * Fixing the whitespace
    
    * Remove unnecessary directive
    
    * Fix imports ordering
    
    * Fix imports ordering
    
    * Resolve imports ordering
    
    * Fixing imports ordering
    
    * Fix response model, add MaxProjects
    
    * Fix filename
    
    * Fix format
    
    * Fix: seat price should match annual/monthly
    
    * Fix service account annual pricing
    
    * Changes for secret manager signup and upgradeplan
    
    * Changes for secrets manager signup and upgrade
    
    * refactoring the code
    
    * Format whitespace
    
    * remove unnecessary using directive
    
    * Changes for subscription Update
    
    * Update the seatAdjustment and update
    
    * Resolve the PR comment on Subscription creation
    
    * Resolve PR comment
    
    * Add password manager to the error message
    
    * Add UseSecretsManager to the event log
    
    * Resolve PR comment on plan validation
    
    * Resolving pr comments for service account count
    
    * Resolving pr comments for service account count
    
    * Resolve the pr comments
    
    * Remove the store procedure that is no-longer needed
    
    * Add a new class for update subscription
    
    * Modify the Update subscription for sm
    
    * Add the missing property
    
    * Rename a property properly
    
    * Resolving the PR comment
    
    * Resolve PR comments
    
    * Resolving PR comments
    
    * Resolving the Pr comments
    
    * Resolving some PR comments
    
    * Resolving the PR comments
    
    * Resolving the build identity build
    
    * Add additional Validation
    
    * Resolve the Lint issues
    
    * remove unnecessary using directive
    
    * Remove the white spaces
    
    * Adding unit test for the stripe payment
    
    * Remove the incomplete test
    
    * Fixing the failing test
    
    * Fix the failing test
    
    * Fix the fail test on organization service
    
    * Fix the failing unit test
    
    * Fix the whitespace format
    
    * Fix the failing test
    
    * Fix the whitespace format
    
    * resolve pr comments
    
    * Fix the lint message
    
    * refactor the code
    
    * Fix the failing Test
    
    * adding a new endpoint
    
    * Remove the unwanted code
    
    * Changes for Command and Queries
    
    * changes for command and queries
    
    * Fix the Lint issues
    
    * Fix imports ordering
    
    * Resolve the PR comments
    
    * resolve pr comments
    
    * Resolve pr comments
    
    * Fix the failing test on adjustSeatscommandtests
    
    * Fix the failing test
    
    * Fix the whitespaces
    
    * resolve failing test
    
    * rename a property
    
    * Resolve the pr comments
    
    * refactoring the existing implementation
    
    * Resolve the whitespaces format issue
    
    * Resolve the pr comments
    
    * [AC-1462] Created IAvailableServiceAccountsQuery along its implementation and with unit tests
    
    * [AC-1462] Renamed ICountNewServiceAccountSlotsRequiredQuery
    
    * [AC-1462] Added IAutoscaleServiceAccountsCommand and implementation
    
    * Add more unit testing
    
    * fix the whitespaces issues
    
    * [AC-1462] Added unit tests for AutoscaleServiceAccountsCommand
    
    * Add more unit test
    
    * Remove unnecessary directive
    
    * Resolve some pr comments
    
    * Adding more unit test
    
    * adding more test
    
    * add more test
    
    * Resolving some pr comments
    
    * Resolving some pr comments
    
    * Resolving some pr comments
    
    * resolve some pr comments
    
    * Resolving pr comments
    
    * remove whitespaces
    
    * remove white spaces
    
    * Resolving pr comments
    
    * resolving pr comments and fixing white spaces
    
    * resolving the lint error
    
    * Run dotnet format
    
    * resolving the pr comments
    
    * Add a missing properties to plan response model
    
    * Add the email sender for sm seat and service acct
    
    * Add the email sender for sm seat and service acct
    
    * Fix the failing test after email sender changes
    
    * Add staticstorewrapper to properly test the plans
    
    * Add more test and validate the existing test
    
    * Fix the white spaces issues
    
    * Remove staticstorewrapper and fix the test
    
    * fix a null issue on autoscaling
    
    * Suggestion: do all seat calculations in update model
    
    * Resolve some pr comments
    
    * resolving some pr comments
    
    * Return value is unnecessary
    
    * Resolve the failing test
    
    * resolve pr comments
    
    * Resolve the pr comments
    
    * Resolving admin api failure and adding more test
    
    * Resolve the issue failing admin project
    
    * Fixing the failed test
    
    * Clarify naming and add comments
    
    * Clarify naming conventions
    
    * Dotnet format
    
    * Fix the failing dependency
    
    * remove similar test
    
    * [AC-1462] Rewrote AutoscaleServiceAccountsCommand to use UpdateSecretsManagerSubscriptionCommand which has the same logic
    
    * [AC-1462] Deleted IAutoscaleServiceAccountsCommand as the logic will be moved to UpdateSecretsManagerSubscriptionCommand
    
    * [AC-1462] Created method AdjustSecretsManagerServiceAccountsAsync
    
    * [AC-1462] Changed SecretsManagerSubscriptionUpdate to only be set by its constructor
    
    * [AC-1462] Added check to CountNewServiceAccountSlotsRequiredQuery and revised unit tests
    
    * [AC-1462] Revised logic for CountNewServiceAccountSlotsRequiredQuery and fixed unit tests
    
    * [AC-1462] Changed SecretsManagerSubscriptionUpdate to receive Organization as a parameter and fixed the unit tests
    
    * [AC-1462] Renamed IUpdateSecretsManagerSubscriptionCommand methods UpdateSubscriptionAsync and AdjustServiceAccountsAsync
    
    * [AC-1462] Rewrote unit test UpdateSubscriptionAsync_ValidInput_Passes
    
    * [AC-1462] Registered CountNewServiceAccountSlotsRequiredQuery for dependency injection
    
    * [AC-1462] Added parameter names to SecretsManagerSubscriptionUpdateRequestModel
    
    * [AC-1462] Updated SecretsManagerSubscriptionUpdate logic to handle null parameters. Revised the unit tests to test null values
    
    ---------
    
    Co-authored-by: cyprain-okeke <[email protected]>
    Co-authored-by: Thomas Rittson <[email protected]>
    Co-authored-by: Thomas Rittson <[email protected]>
    4 people authored Jul 17, 2023
    Configuration menu
    Copy the full SHA
    0277a70 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. Configuration menu
    Copy the full SHA
    e3387c2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    66252a1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1b6898e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    10f671a View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. Configuration menu
    Copy the full SHA
    3659e7a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1087f66 View commit details
    Browse the repository at this point in the history
  3. [AC-1521] Address checkmarx security feedback (#3124)

    * Reinstate target attribute but add noopener noreferrer
    eliykat authored Jul 19, 2023
    Configuration menu
    Copy the full SHA
    c72d29b View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. Configuration menu
    Copy the full SHA
    ec31bb6 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2023

  1. Merge branch 'master' into feature/sm-billing

    # Conflicts:
    #	test/Core.Test/Services/StripePaymentServiceTests.cs
    r-tome committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    2e7a480 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2023

  1. Configuration menu
    Copy the full SHA
    2c0ff09 View commit details
    Browse the repository at this point in the history
  2. Remove unused constant

    cyprain-okeke committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    4fcb9da View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5b215cd View commit details
    Browse the repository at this point in the history
  4. Revert "Remove unused constant"

    This reverts commit 4fcb9da.
    
    This is required to make feature flags work on the client
    eliykat committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    fd4e306 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a2e2dd6 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2023

  1. Configuration menu
    Copy the full SHA
    92514d1 View commit details
    Browse the repository at this point in the history
  2. [AC-1458] Add Endpoint And Service Logic for secrets manager to exist…

    …ing subscription (#3087)
    
    ---------
    
    Co-authored-by: Thomas Rittson <[email protected]>
    Co-authored-by: Thomas Rittson <[email protected]>
    3 people authored Jul 25, 2023
    Configuration menu
    Copy the full SHA
    7858d59 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    13ee404 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. Configuration menu
    Copy the full SHA
    2ded9d6 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2023

  1. Configuration menu
    Copy the full SHA
    e805405 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2dd0013 View commit details
    Browse the repository at this point in the history
  3. [AC-1468] Modified CountNewServiceAccountSlotsRequiredQuery to return…

    … zero if organization has SecretsManagerBeta == true (#3112)
    
    Co-authored-by: Thomas Rittson <[email protected]>
    r-tome and eliykat authored Jul 27, 2023
    Configuration menu
    Copy the full SHA
    d35de15 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. [Ac 1563] Unable to load billing and subscription related pages for n…

    …on-enterprise organizations (#3138)
    
    * Resolve the failing family plan
    
    * resolve issues
    
    * Resolve code related pr comments
    
    * Resolve test related comments
    
    * Resolving or comments
    cyprain-okeke authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    fb569a9 View commit details
    Browse the repository at this point in the history
  2. [SM-809] Add service account slot limit check (#3093)

    * Add service account slot limit check
    
    * Add query to DI
    
    * [AC-1462] Registered CountNewServiceAccountSlotsRequiredQuery for dependency injection
    
    * remove duplicate DI entry
    
    * Update unit tests
    
    * Remove comment
    
    * Code review updates
    
    ---------
    
    Co-authored-by: cyprain-okeke <[email protected]>
    Co-authored-by: Thomas Rittson <[email protected]>
    Co-authored-by: Thomas Rittson <[email protected]>
    Co-authored-by: Rui Tome <[email protected]>
    5 people authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    f69bf1a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    aa9d752 View commit details
    Browse the repository at this point in the history
  4. [AC-1461] Secrets manager seat autoscaling (#3121)

    * Add autoscaling code to invite user, save user, and bulk enable SM
      flows
    
    * Add tests
    
    * Delete command for BulkEnableSecretsManager
    
    * circular dependency between OrganizationService and
      UpdateSecretsManagerSubscriptionCommand - fixed by temporarily
      duplicating ReplaceAndUpdateCache
    
    * Unresolvable dependencies in other services - fixed by temporarily
      registering noop services and moving around some DI code
    
    All should be resolved in PM-1880
    
    * Refactor: improve the update object and use it to adjust values,
      remove excess interfaces on the command
    
    * Handle autoscaling-specific errors
    
    ---------
    
    Co-authored-by: Rui Tomé <[email protected]>
    eliykat and r-tome authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    88b81e3 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    d905bbb View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2023

  1. Merge branch 'master' into PM-3007-resolve-high-db-resource-usage-by-…

    …organization-user-read-by-user-id-with-policy-details-sproc
    
    # Conflicts:
    #	src/Core/Repositories/IOrganizationUserRepository.cs
    r-tome committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    f3a996b View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. Configuration menu
    Copy the full SHA
    59bfecd View commit details
    Browse the repository at this point in the history
  2. Merge branch 'PM-3007-resolve-high-db-resource-usage-by-organization-…

    …user-read-by-user-id-with-policy-details-sproc' into AC-108-enterprise-polices-are-not-removed-when-downgraded-to-teams
    
    # Conflicts:
    #	src/Infrastructure.EntityFramework/Repositories/OrganizationUserRepository.cs
    #	src/Sql/dbo/Stored Procedures/OrganizationUser_ReadByUserIdWithPolicyDetails.sql
    r-tome committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    600df78 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ceb3b81 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e483587 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    ae998dd View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    350a2e6 View commit details
    Browse the repository at this point in the history
  7. Revert "[AC-108] Trying to resolve the DB diff"

    This reverts commit 350a2e6.
    r-tome committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    0977835 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    5f5bb66 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    f7340a9 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    3b43c90 View commit details
    Browse the repository at this point in the history
  11. [AC 1526]Show current SM seat and service account usage in Bitwarden …

    …Portal (#3142)
    
    * changes base on the tickets request
    
    * Code refactoring
    
    * Removed the unwanted method
    
    * Add implementation to the new method
    
    * Resolve some pr comments
    
    * resolve lint issue
    
    * resolve pr comments
    
    * add the new noop files
    
    * Add new noop file and resolve some pr comments
    
    * resolve pr comments
    
    * removed unused method
    cyprain-okeke authored Aug 2, 2023
    Configuration menu
    Copy the full SHA
    a128454 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2023

  1. Configuration menu
    Copy the full SHA
    b7ebd7e View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into feature/sm-billing-round-2

    # Conflicts:
    #	src/Api/SecretsManager/Controllers/ServiceAccountsController.cs
    r-tome committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    5b0a701 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2023

  1. Fix prefill when changing plans or starting trials

    * [AC-1575] Don't overwrite existing org information when changing plans
    * [AC-1577] Prefill SM configuration section when starting trial
    eliykat committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    06f34f8 View commit details
    Browse the repository at this point in the history
  2. Clarify property names

    eliykat committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    afa60a5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b58c14b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    69cc54c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2e95387 View commit details
    Browse the repository at this point in the history
  6. Edit comment

    eliykat committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    1b10f8e View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    4acbfa4 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2023

  1. Configuration menu
    Copy the full SHA
    0205cad View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    dd008cb View commit details
    Browse the repository at this point in the history
  3. Use plans directly in JS

    eliykat committed Aug 6, 2023
    Configuration menu
    Copy the full SHA
    9ad71cb View commit details
    Browse the repository at this point in the history
  4. Refactor to getPlan function

    eliykat committed Aug 6, 2023
    Configuration menu
    Copy the full SHA
    3132c5e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    bb2d9bc View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    e318f7a View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    6a218e2 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2023

  1. Add @model specification

    eliykat committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    5d45768 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into AC-108-enterprise-polices-are-not-removed-…

    …when-downgraded-to-teams
    
    # Conflicts:
    #	src/Infrastructure.EntityFramework/Repositories/OrganizationUserRepository.cs
    #	src/Sql/dbo/Stored Procedures/OrganizationUser_ReadByUserIdWithPolicyDetails.sql
    #	util/Migrator/DbScripts/2023-07-18_00_OrganizationUserReadByUserIdWithPolicyDetails.sql
    r-tome committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    86095dc View commit details
    Browse the repository at this point in the history
  3. Merge branch 'ac/ac-1577/prefill-bitwarden-portal-values' into AC-108…

    …-enterprise-polices-are-not-removed-when-downgraded-to-teams
    
    # Conflicts:
    #	src/Admin/Views/Organizations/Edit.cshtml
    #	src/Admin/Views/Shared/_OrganizationFormScripts.cshtml
    r-tome committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    7b546c7 View commit details
    Browse the repository at this point in the history