Merged
Conversation
…nce they are hardcoded.
Also making sure we encode/decode site and page parameters.
# Conflicts: # package.json # src/adaptermanager.js
Fix unit tests after refactoring
Merge remote-tracking branch 'upstream/master' # Conflicts: # package.json
# Conflicts: # .gitignore # package.json # src/adapters/wideorbit.js # test/spec/adapters/wideorbit_spec.js
matthewlane
reviewed
Feb 17, 2017
Collaborator
matthewlane
left a comment
matthewlane
left a comment
There was a problem hiding this comment.
@bjorn-wo Two comments for your review below then this can merge, thank you
| params: { | ||
| pbId: 123, // REQUIRED Publisher Id, | ||
| pId: 123456 // REQUIRED Placement Id | ||
| } |
Collaborator
There was a problem hiding this comment.
pbjs_example_gpt.html already includes the same wideorbit params further up the page, are these new ones needed or can they be removed?
Contributor
Author
There was a problem hiding this comment.
Thank you for spotting this. It looks like there was a problem when mergin in the latest code.
| @@ -1,213 +1,215 @@ | |||
| var bidfactory = require('../bidfactory.js'), | |||
Collaborator
There was a problem hiding this comment.
The line endings in this commit are CRLF (Windows-style), but the current wideorbit adapter uses LF (Unix-style) line endings. Can you keep LF line endings so the diff is easier to read?
matthewlane
approved these changes
Feb 23, 2017
vzhukovsky
added a commit
to aol/Prebid.js
that referenced
this pull request
May 19, 2017
…18.0 to aolgithub-master * commit '2881f03dd76bfcf484fbfeaf0f9e1000b383d20d': Added adapters in aolPartnersIds.json. Added changelog entry. Prebid 0.20.0 Release Remove test that intermittently fails unit tests (prebid#1020) Create bids for requests without mutating ad units (prebid#1019) Use optimize js to improve parse time (https://github.com/nolanlawson/optimize-js) (prebid#1018) Fixes for Centro adapter (prebid#992) adbund adapter (prebid#932) Fix bug with supporting non-cpm dealId bids. (prebid#1006) Added referrer parameter (prebid#966) Support Video for GetIntent adapter (prebid#987) Currency support for SmartAdServer adapter (prebid#979) Deal support for SmartAdServer adapter (prebid#978) Skip test causing build failures (prebid#997) E2etest concurrency (prebid#982) Add ThoughtLeadr adapter (prebid#894) Increment Pre Version
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Type of change
Description of change
Added a new parameter "referrer" where publisher can (optionally) insert the referrer domain if the ad is running within an iframe where the url can't be detected.
bandersson@wideorbit.com
Other information