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

Justpremium Adapter for 1.0 #1782

Closed
wants to merge 34 commits into from
Closed

Justpremium Adapter for 1.0 #1782

wants to merge 34 commits into from

Conversation

mkalafior
Copy link
Contributor

Type of change

  • Bugfix
  • Feature
  • New bidder adapter
  • Code style update (formatting, local variables)
  • Refactoring (no functional changes, no api changes)
  • Build related changes
  • CI related changes
  • Other

Description of change

  • test parameters for validating bids
       {
           sizes: [[1, 1]],
           code: 'div-gpt-ad-1471513102552-0',
           bids: [
               {
                   bidder: 'justpremium', 
                   params: {
                       zone: 34364
                   }
               },
           ]
       }

mkalafior and others added 30 commits May 24, 2017 14:26
@mkalafior
Justpremium adapter and unit tests.
8aa8f9c
@mkalafior
Fix test suit.
00a2ce6
@mkalafior
Performance improvements.
0816e98
@mkalafior
Changes requested in pull request review.
6cc1617
@mkalafior
Merge with upstream
4917b85
@mkalafior
Register justpremium adapter in adaptermanager
5fefb28
@mkalafior
Merge remote-tracking branch 'upstream/master'
92da906
@mkalafior
Merge branch 'master' of https://github.com/prebid/Prebid.js
83d5022
@mkalafior
pass through bid from request
16a7b42
@mkalafior
Merge branch 'master' of https://github.com/prebid/Prebid.js
b943b79
@mkalafior
fix linting errors
d8ddfd0
@jaiminpanchal27
Concurrent auctions (prebid#1593)
1bdedd6 
* Adding timestamp function to utils

* Auction manager (WIP)

* WIP

* Updated targeting with auction instances and added auction status

* Updated appnexus and appnexusAst adapter

* Added done callback

* Removing bidmanager functions

* Removing deprecated public api functions

* remove bidmanager file

* Revert "remove bidmanager file"

This reverts commit 616409e.

* Updated appnexus and rubicon adapters to call done callback after all responses are back

* Added todo

* Fixing circular dependency

* filter s2s requests

* Emit auction end
Add getBidsRequested function

* remove unused stuff from adapters

* cleanup and fixes

* Unit test fixes
Added exclude to karma temporarily to support unit tests

* added setTimeout for each auction instance

* added constants closer to code

* binded auction object inside done method

* Adding auctionmanager_spec tests and fixes

* Remove breakpoint

* Moving auction to separate file and unit tests

* Merged manually

* Merged config api changes

* Passing adunits, adunitscodes via constructor and fixing unit tests

* added ajax with timeout

* convert targeting module to factory pattern

* Auction code refactored and unit tests

* Updated bidderfactory for 1.0 changes and added unit tests

* Renamed placementCode to adUnitCode

* Refactor auction and update unit tests

* JSDoc for auction and auctionManager

* Unit test fixes after rebase

* Manual merge new updates to bidmanager and its spec file into auction

* Update appnexusAst spec file

* Refactor

* Prebid 1.0 does not require no_bid to be added

* removed side effect by cloning objects

* bug fix to set status on already used bid

* Removing all !1.0 complaiant adapters

* Adding aliases to appnexusAst adapter

* Removed bidmanager from currency
@thewizarodofoz @matthewlane
Add ignore-loader to handle .md files (prebid#1646)
8f34dd5
@jaiminpanchal27 @dbemiller
Auction module refactor (prebid#1644)
e441723 
* Auction moduel refactor

* remove comment and global cbtimeout
@jaiminpanchal27
Config api updates (prebid#1633)
f7a1789 
* Add timeoutBuffer, s2sconfig, bidderSequence to config

* Removing deprecated function and its unit test

* fixed linting errors
@jaiminpanchal27
Merge branch 'master' of github.com:prebid/Prebid.js into prebid-1.0
09bfa63 
# Conflicts:
#	modules/adxcgBidAdapter.js
#	modules/adyoulikeBidAdapter.js
#	modules/criteoBidAdapter.js
#	modules/gumgumBidAdapter.js
#	modules/openxBidAdapter.js
#	modules/prebidServerBidAdapter.js
#	modules/pulsepointLiteBidAdapter.js
#	modules/rubiconBidAdapter.js
#	modules/serverbidBidAdapter.js
#	modules/ucfunnelBidAdapter.js
#	modules/unrulyBidAdapter.js
#	modules/vertozBidAdapter.js
#	modules/yieldmoBidAdapter.js
#	src/adaptermanager.js
#	src/adapters/bidderFactory.js
#	src/bidmanager.js
#	src/native.js
#	src/prebid.js
#	test/spec/bidmanager_spec.js
#	test/spec/modules/adyoulikeBidAdapter_spec.js
#	test/spec/modules/appnexusAstBidAdapter_spec.js
#	test/spec/modules/appnexusBidAdapter_spec.js
#	test/spec/modules/criteoBidAdapter_spec.js
#	test/spec/modules/justpremiumBidAdapter_spec.js
#	test/spec/modules/komoonaBidAdapter_spec.js
#	test/spec/modules/marsmediaBidAdapter_spec.js
#	test/spec/modules/openxBidAdapter_spec.js
#	test/spec/modules/prebidServerBidAdapter_spec.js
#	test/spec/modules/pulsepointLiteBidAdapter_spec.js
#	test/spec/modules/rubiconBidAdapter_spec.js
#	test/spec/modules/sharethroughBidAdapter_spec.js
#	test/spec/unit/core/adapterManager_spec.js
@jaiminpanchal27
Merge branch 'master' of github.com:prebid/Prebid.js into prebid-1.0
df3fb3d 
# Conflicts:
#	modules/rubiconBidAdapter.js
#	test/spec/modules/rubiconBidAdapter_spec.js
@mkalafior
merge
62438ed
@mkalafior
Load polyfills for older browsers
d8e5cf8
@mkalafior
Merge remote-tracking branch 'upstream/master'
1eb433a
@mkalafior
Merge branch 'master' into bugfix/ie-polyfills
97b0dd7
@mkalafior
Load polyfills if older browser
4683a30
@mkalafior
Remove package-lock.json
ed9979e
justpremium prebid adapter first version
208fd7b
changes for adpater and new tests
5276b33
refactoring
baa04da
documentation (file .md)
670968d
@mkalafior
Update adapter doc
b830a14
tests fix
88843e0
@mkalafior
Merge branch 'feature/1.0' of https://github.com/mkalafior/Prebid.js …
cf18d2d 
…into feature/1.0
@ndhimehta ndhimehta assigned harpere and snapwich and unassigned harpere Nov 1, 2017
@snapwich snapwich self-requested a review November 8, 2017 21:39
snapwich
snapwich approved these changes Nov 8, 2017
View reviewed changes
Copy link
Collaborator

@snapwich snapwich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ndhimehta ndhimehta added the LGTM label Nov 15, 2017
@ndhimehta ndhimehta closed this Nov 15, 2017
@ehulsbosch
Copy link

@ndhimehta
Could you let us know why this request has been closed instead of merged?

@mkendall07 mkendall07 reopened this Nov 17, 2017
@matthewlane
Copy link
Collaborator

@mkalafior @ehulsbosch Please update this PR to target the master branch rather than prebid-1.0. prebid-1.0 will eventually be transitioned to master but we are merging 1.0 adapters into master currently

@mkalafior mkalafior changed the base branch from prebid-1.0 to master November 23, 2017 07:53
@mkalafior
Merge remote-tracking branch 'upstream/master'
34ea947
@mkalafior
Merge branch 'master' into feature/1.0
8cbe9c5 
# Conflicts:
#	modules/adbutlerBidAdapter.js
#	modules/adkernelBidAdapter.js
#	modules/adxcgBidAdapter.js
#	modules/aolBidAdapter.js
#	modules/appnexusBidAdapter.js
#	modules/audienceNetworkBidAdapter.js
#	modules/beachfrontBidAdapter.js
#	modules/centroBidAdapter.js
#	modules/conversantBidAdapter.js
#	modules/currency.js
#	modules/featureforwardBidAdapter.js
#	modules/fidelityBidAdapter.js
#	modules/getintentBidAdapter.js
#	modules/huddledmassesBidAdapter.js
#	modules/improvedigitalBidAdapter.js
#	modules/jcmBidAdapter.js
#	modules/justpremiumBidAdapter.js
#	modules/kargoBidAdapter.js
#	modules/komoonaBidAdapter.js
#	modules/kummaBidAdapter.js
#	modules/mobfoxBidAdapter.js
#	modules/openxBidAdapter.js
#	modules/platformioBidAdapter.js
#	modules/polluxBidAdapter.js
#	modules/prebidServerBidAdapter.js
#	modules/pubmaticBidAdapter.js
#	modules/quantcastBidAdapter.js
#	modules/rhythmoneBidAdapter.js
#	modules/sharethroughBidAdapter.js
#	modules/sonobiBidAdapter.js
#	modules/sovrnBidAdapter.js
#	modules/spotxBidAdapter.js
#	modules/trustxBidAdapter.js
#	modules/underdogmediaBidAdapter.js
#	modules/vertamediaBidAdapter.js
#	modules/yieldmoBidAdapter.js
#	src/adaptermanager.js
#	src/adapters/bidderFactory.js
#	src/bidmanager.js
#	src/prebid.js
#	test/spec/bidmanager_spec.js
#	test/spec/modules/adbutlerBidAdapter_spec.js
#	test/spec/modules/adkernelBidAdapter_spec.js
#	test/spec/modules/adxcgBidAdapter_spec.js
#	test/spec/modules/aolBidAdapter_spec.js
#	test/spec/modules/audienceNetworkBidAdapter_spec.js
#	test/spec/modules/beachfrontBidAdapter_spec.js
#	test/spec/modules/c1xBidAdapter_spec.js
#	test/spec/modules/centroBidAdapter_spec.js
#	test/spec/modules/conversantBidAdapter_spec.js
#	test/spec/modules/fidelityBidAdapter_spec.js
#	test/spec/modules/getintentBidAdapter_spec.js
#	test/spec/modules/huddledmassesBidAdapter_spec.js
#	test/spec/modules/improvedigitalBidAdapter_spec.js
#	test/spec/modules/jcmBidAdapter_spec.js
#	test/spec/modules/kargoBidAdapter_spec.js
#	test/spec/modules/komoonaBidAdapter_spec.js
#	test/spec/modules/kummaBidAdapter_spec.js
#	test/spec/modules/mobfoxBidAdapter_spec.js
#	test/spec/modules/openxBidAdapter_spec.js
#	test/spec/modules/orbitsoftBidAdapter_spec.js
#	test/spec/modules/platformioBidAdapter_spec.js
#	test/spec/modules/polluxBidAdapter_spec.js
#	test/spec/modules/prebidServerBidAdapter_spec.js
#	test/spec/modules/quantcastBidAdapter_spec.js
#	test/spec/modules/rhythmoneBidAdapter_spec.js
#	test/spec/modules/sharethroughBidAdapter_spec.js
#	test/spec/modules/sovrnBidAdapter_spec.js
#	test/spec/modules/trustxBidAdapter_spec.js
#	test/spec/modules/underdogmediaBidAdapter_spec.js
#	test/spec/modules/vertamediaBidAdapter_spec.js
#	test/spec/modules/yieldmoBidAdapter_spec.js
#	test/spec/unit/core/adapterManager_spec.js
#	test/spec/unit/core/bidderFactory_spec.js
#	test/spec/unit/pbjs_api_spec.js
@mkalafior
Copy link
Contributor Author

@matthewlane i'm closing this pr because of some problems with merge. Here you can find new one #1881 .

@mkalafior mkalafior closed this Nov 23, 2017
@mkalafior mkalafior deleted the feature/1.0 branch June 18, 2018 12:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@snapwich snapwich snapwich approved these changes

Assignees

@snapwich snapwich

Labels
in progress LGTM Prebid 1.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@mkalafior @ehulsbosch @matthewlane @snapwich @mkendall07 @harpere @mjacobsonny @ndhimehta @jaiminpanchal27 @thewizarodofoz