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

Prevent 'about:' protocol in _publisherTagUrl #1170

Merged
merged 9 commits into from
Jun 7, 2017
Merged

Prevent 'about:' protocol in _publisherTagUrl #1170

merged 9 commits into from
Jun 7, 2017

Commits on Feb 10, 2016

  1. handle pubmatic targeting key value pairs if in DFP GPT format

    @tomraa
    tomraa committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    9713dc4 View commit details
    Browse the repository at this point in the history

  2. hardcoded pubmatic request to https as protocol-less url prevents chr… 

    …ome req from injected iframe
    @tomraa
    tomraa committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    6683062 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2017

  1. fixed upstream merge conflict

    @tomraa
    tomraa committed May 2, 2017
    Configuration menu
    Copy the full SHA
    981b27f View commit details
    Browse the repository at this point in the history

  2. add newline for consistency

    @tomraa
    tomraa committed May 2, 2017
    Configuration menu
    Copy the full SHA
    478354d View commit details
    Browse the repository at this point in the history

  3. specifically check for http prot, fall back to https in crit adapter

    @tomraa
    tomraa committed May 2, 2017
    Configuration menu
    Copy the full SHA
    1d7c046 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2017

  1. added spaces to pass eslint #1170

    @tomraa
    tomraa committed May 19, 2017
    Configuration menu
    Copy the full SHA
    1b4f21c View commit details
    Browse the repository at this point in the history

Commits on May 22, 2017

  1. Merge branch 'master' into master

    @tomraa
    tomraa authored May 22, 2017
    Configuration menu
    Copy the full SHA
    eda9245 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2017

  1. removed blank line refs PR #1170

    @tomraa
    tomraa committed May 25, 2017
    Configuration menu
    Copy the full SHA
    957e195 View commit details
    Browse the repository at this point in the history

  2. fixed merge conflict

    @tomraa
    tomraa committed May 25, 2017
    Configuration menu
    Copy the full SHA
    880c813 View commit details
    Browse the repository at this point in the history