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.

Sign up for GitHub

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

Jump to bottom

Only org policy #962

Merged
merged 23 commits into from
Oct 20, 2020
Merged

Only org policy #962

merged 23 commits into from
Oct 20, 2020

Commits on Oct 6, 2020

  1. added OnlyOrg to PolicyType enum

    @addisonbeck
    addisonbeck committed Oct 6, 2020
    Configuration menu
    Copy the full SHA
    0720f5e View commit details
    Browse the repository at this point in the history

  2. blocked accepting new org invitations if OnlyOrg is relevant to the u… 

    …serOrg
    @addisonbeck
    addisonbeck committed Oct 6, 2020
    Configuration menu
    Copy the full SHA
    118b997 View commit details
    Browse the repository at this point in the history

  3. blocked creating new orgs if already in an org with OnlyOrg enabled

    @addisonbeck
    addisonbeck committed Oct 6, 2020
    Configuration menu
    Copy the full SHA
    33c8af8 View commit details
    Browse the repository at this point in the history

  4. created email alert for OnlyOrg policy

    @addisonbeck
    addisonbeck committed Oct 6, 2020
    Configuration menu
    Copy the full SHA
    e476ebd View commit details
    Browse the repository at this point in the history

  5. removed users & sent alerts when appropriate for the OnlyOrg policy

    @addisonbeck
    addisonbeck committed Oct 6, 2020
    Configuration menu
    Copy the full SHA
    cb16690 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2020

  1. added method to noop mail service

    @addisonbeck
    addisonbeck committed Oct 7, 2020
    Configuration menu
    Copy the full SHA
    b8faa4e View commit details
    Browse the repository at this point in the history

  2. cleanup for OnlyOrg policy server logic

    @addisonbeck
    addisonbeck committed Oct 7, 2020
    Configuration menu
    Copy the full SHA
    28c2051 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2020

  1. blocked confirming new org users if they have violated the OnlyOrg po… 

    …licy since accepting
    @addisonbeck
    addisonbeck committed Oct 8, 2020
    Configuration menu
    Copy the full SHA
    839b1bb View commit details
    Browse the repository at this point in the history

  2. added localization strings needed for the OnlyOrg policy

    @addisonbeck
    addisonbeck committed Oct 8, 2020
    Configuration menu
    Copy the full SHA
    e5e5e8a View commit details
    Browse the repository at this point in the history

  3. allowed OnlyOrg policy configuration from the portal

    @addisonbeck
    addisonbeck committed Oct 8, 2020
    Configuration menu
    Copy the full SHA
    df7f2d2 View commit details
    Browse the repository at this point in the history

  4. used correct localization key for onlyorg

    @addisonbeck
    addisonbeck committed Oct 8, 2020
    Configuration menu
    Copy the full SHA
    3374c23 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2020

  1. formatting and messaging changes for OnlyOrg

    @addisonbeck
    addisonbeck committed Oct 10, 2020
    Configuration menu
    Copy the full SHA
    3d709fd View commit details
    Browse the repository at this point in the history

  2. formatting

    @addisonbeck
    addisonbeck committed Oct 10, 2020
    Configuration menu
    Copy the full SHA
    eabd06e View commit details
    Browse the repository at this point in the history

  3. messaging change

    @addisonbeck
    addisonbeck committed Oct 10, 2020
    Configuration menu
    Copy the full SHA
    de295de View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2020

  1. code review changes for onlyorg

    @addisonbeck
    addisonbeck committed Oct 13, 2020
    Configuration menu
    Copy the full SHA
    c5bcf17 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2020

  1. slimmed down a conditional

    @addisonbeck
    addisonbeck committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    ac97c52 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into OnlyOrgPolicy

    Addison Beck authored Oct 14, 2020
    Configuration menu
    Copy the full SHA
    e6b2c9f View commit details
    Browse the repository at this point in the history

  3. optimized getting many orgUser records from many userIds

    @addisonbeck
    addisonbeck committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    eafebd8 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'OnlyOrgPolicy' of https://www.github.com/bitwarden/server… 

    … into OnlyOrgPolicy
    @addisonbeck
    addisonbeck committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    f56a3fd View commit details
    Browse the repository at this point in the history

  5. removed a test file

    @addisonbeck
    addisonbeck committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    30b5b56 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2020

  1. sql formatting

    @addisonbeck
    addisonbeck committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    354d059 View commit details
    Browse the repository at this point in the history

  2. weirdness

    @addisonbeck
    addisonbeck committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    1965d49 View commit details
    Browse the repository at this point in the history

  3. trying to resolve git diff formatting issues

    @addisonbeck
    addisonbeck committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    50bb35c View commit details
    Browse the repository at this point in the history