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

Merge Master Into Canary #162

Merged
merged 9 commits into from
Jan 17, 2020
Merged

Merge Master Into Canary #162

merged 9 commits into from
Jan 17, 2020

Commits on Dec 26, 2019

  1. TrustX: Add CCPA support

    @PWyrembak
    PWyrembak committed Dec 26, 2019
    Configuration menu
    Copy the full SHA
    301ac0f View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2020

  1. support IAB us privacy string

    @samuelhorwitz
    samuelhorwitz committed Jan 3, 2020
    Configuration menu
    Copy the full SHA
    2f3160f View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2020

  1. improve sanity checks for usp

    @samuelhorwitz
    samuelhorwitz committed Jan 10, 2020
    Configuration menu
    Copy the full SHA
    eb17b9e View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2020

  1. Revert "Merge pull request #155 from rubicon-project/master" 

    This reverts commit f44baac, reversing
changes made to 71bc186.
    @ix-certification
    ix-certification committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    40e76d9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #157 from indexexchange/testBranchRevert 

    Revert "Merge pull request #155 from rubicon-project/master"
    @ix-certification
    ix-certification committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    a9a2d35 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2020

  1. Revert "Revert "Merge pull request #155 from rubicon-project/master""

    @ix-certification
    ix-certification committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    5996363 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #143 from KargoGlobal/kargo-ccpa 

    [HTP-115] Kargo support for IAB US privacy string
    @ix-certification
    ix-certification committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    cd9ec46 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #142 from PWyrembak/master 

    [HTP-114]TrustX: Add CCPA support
    @ix-certification
    ix-certification committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    4adc3c6 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #161 from indexexchange/revert-157-testBranchRevert 

    Revert "Revert "Merge pull request #155 from rubicon-project/master""
    @ix-certification
    ix-certification committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    ee15007 View commit details
    Browse the repository at this point in the history