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

Prebid upgarde automate- test pull request created through git api please ignore it #330

Merged
merged 214 commits into from
May 24, 2019
Merged

Prebid upgarde automate- test pull request created through git api please ignore it #330

merged 214 commits into from
May 24, 2019

Conversation

pm-pramod-pisal
Copy link
Collaborator

No description provided.

jsnellbaker and others added 30 commits February 14, 2018 13:12
@jsnellbaker
initial commit
bcf27d8
@jsnellbaker
wip update 2
cda55fe
@jsnellbaker
wip update 3
77de2e5
@mkendall07
example
ebe1ee8
@mkendall07
clean up
3cda142
@jsnellbaker
wip update 3
6337a2e
@jsnellbaker
hook setup for callBids
78f0e9c
@jsnellbaker
wip update 4
2412b4f
@jsnellbaker
changed gdpr code to be async-like
b8c1da6
@mkendall07
cleaned up the callback chain
173d945
@jsnellbaker
added iab cmp detection logic
6f57a89
@jsnellbaker
Merge branch 'master' into gdpr
83a4ed9
@jsnellbaker
moved hook, reverted unit test changes, and restructed gdpr module
2a587eb
@jsnellbaker
renaming module from gdpr to consentManagement
2018378
@jsnellbaker
prebidserver adatper update, additional changes in module
0081610
@jsnellbaker
updated unit tests for all areas, updates to module logic and structu…
a46ca14 
…re of consent data
@jsnellbaker
adding missing default value
6739fd0
@jsnellbaker
removing accidentally committed load time testing code
63d0d21
@PubMatic-OpenWrap
Merge pull request #14 from prebid/master
36a1101 
Merge prebid master
@pm-manasi-moghe
adding modules.json for backward compatibility
a5087dc
@pm-manasi-moghe
test commit
2a34e52
@pm-manasi-moghe
test commit
586c7cc
@jsnellbaker
changes to layout of consentManagement code and other items based on …
effc19c 
…feedback
@jsnellbaker
moved unit test to different location
e6d8068
@jsnellbaker
finished incomplete unit test in appnexusBidAdapter_spec file
326e712
@jsnellbaker
altered CMP function call logic
112a61b
@pm-dattaprasad-mundada
Update package-lock.json to resolve npm install issue
71f8f3b
@pm-dattaprasad-mundada
Update package.json
45c9908
@pm-dattaprasad-mundada
Add pubmaticServerBidAdapter
9e22dd2
@jsnellbaker
refactored consentManagement AN lookup function and added gdprDataHan…
91b6d83 
…dler to help transfer data in auction
pm-shashank-jain and others added 29 commits February 8, 2019 21:01
@pm-shashank-jain
Merge pull request #307 from PubMatic-OpenWrap/multisizesingleimpression
551b832 
Single impression for multisize slot
@pm-pramod-pisal
automate-creation of modules.json file
4495cff
@pm-shashank-jain
Merge branch 'prebid_upgrade_2_2_0_20190213112513' into test_br_b2_20…
965bebd 
…190213112514
@pm-shashank-jain
Merge pull request #318 from PubMatic-OpenWrap/test_br_b2_20190213112514
b0a090c 
Prebid upgarde automate- test pull request created through git api please ignore it
@pm-shashank-jain
Merge Conflicts Resolved and errors fixed
49a24e5
@pm-manasi-moghe
triggering usersyncs manually, to ensure syncup occurs in case of ser…
d6ebd3f 
…ver side enabled partners
@pm-shashank-jain
Merge pull request #319 from PubMatic-OpenWrap/prebid_upgrade_2_2_0_2…
6427439 
…0190213112513

Prebid upgrade 2 2 0 20190213112513
@pm-shashank-jain
Merge pull request #320 from PubMatic-OpenWrap/nightly_2.2.0
5be60fb 
Nightly 2.2.0
@pm-shashank-jain
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid.js
ec57523 
 into ownativesupport
@pm-shashank-jain
changes in native keys from hb_ to pwt_
623c575
@pm-shashank-jain
added ext in logo and icon
7dcc01e
@pm-shashank-jain
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid.js
afc9061 
 into nightly
@pm-shashank-jain
Hook Fix
856ca96
@pm-shashank-jain
Merge branch 'ownativesupport' of https://github.com/PubMatic-OpenWra…
02462be 
…p/Prebid.js into hookissuefix
@pm-shashank-jain
Merge pull request #322 from PubMatic-OpenWrap/hookissuefix
caf15e6 
Hookissuefix
@pm-shashank-jain
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid.js
441c069 
 into nightly
@pm-shashank-jain
Support for ext object in icon
042c940
@pm-shashank-jain
Merge pull request #323 from PubMatic-OpenWrap/hookissuefix
b346108 
Support for ext object in icon
@pm-shashank-jain
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid.js
4fd7ec1 
 into nightly
@pm-pramod-pisal
automate-creation of modules.json file
de208cd
@pm-shashank-jain
Merge branch 'prebid_upgrade_2_8_0_20190403124838' into test_br_b2_20…
083ade8 
…190403124840
@pm-shashank-jain
Merge pull request #326 from PubMatic-OpenWrap/test_br_b2_20190403124840
220f7c7 
Prebid upgarde automate- test pull request created through git api please ignore it
@pm-shashank-jain
Fixed merge issue and test cases fixes
ee81117
@pm-shashank-jain
Merge pull request #327 from PubMatic-OpenWrap/prebid_upgrade_2_8_0_2…
99eaf62 
…0190403124838

Prebid upgrade 2 8 0 20190403124838
@pm-shashank-jain
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid.js
6481d52 
 into multisizesingleimpression
@pm-shashank-jain
Check for valid sizes only
8cc71d1
@pm-shashank-jain
Unit test cases for the change
f3fb7d6
@pm-shashank-jain
Merge pull request #329 from PubMatic-OpenWrap/multisizesingleimpression
853f49f 
Check for Ignoring fluid size, multisize single impression
@pm-shashank-jain
Merge branch 'prebid_upgrade_2_16_20190523095538' into test_br_b2_201…
e890d17 
…90523095539
@pm-shashank-jain pm-shashank-jain merged commit 0d3aae8 into prebid_upgrade_2_16_20190523095538 May 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@pm-pramod-pisal @pm-harshad-mane @PubMatic-OpenWrap @pm-shashank-jain @jsnellbaker @mkendall07 @pm-manasi-moghe @pm-dattaprasad-mundada