Skip to content

Commit

Permalink
Merge tag '7.44.0' into stable-next
Browse files Browse the repository at this point in the history
* tag '7.44.0': (320 commits)
  Prebid 7.44.0 release
  Concert Bid Adapter: Enable support for additional userId's (prebid#9780)
  vidazoo Bid Adapter: update support of metaData (prebid#9749)
  Criteo Bid Adapter: Read GPP from ortb2 object (prebid#9775)
  OpenxOrtbAdapter: add back missing params support for coppa and video (prebid#9782)
  size map support (prebid#9772)
  Multiple bids in one request to Adrino Adserver (prebid#9742)
  Multiple modules: decouple GVL IDs from storage access control (prebid#9736)
  Update gumgumBidAdapter.js (prebid#9779)
  appnexus bid adapter - add gvlids to aliases (prebid#9777)
  Update undertoneBidAdapter.js (prebid#9778)
  PubMatic Bid Adapter: native 1.2 support (prebid#9701)
  Criteo ID Module: Add error callback for pixel sync call (prebid#9754)
  TTD Bid Adapter: add support for video.plcmt and imp.rwdd (prebid#9762)
  BrightcomSSP, Brightcom: remove options overide from buildRequests (prebid#9753)
  AIDEM Bid Adapter: extended app/site parameters on win notice  (prebid#9765)
  ZetaGlobalSsp Bid Adapter: provide tagid from params (prebid#9764)
  Craft Bid Adapter : update for imuIdSystem (prebid#9757)
  LocalStorage availability logging (prebid#9755)
  Greenbids Analytics Adapter: create new analytics adapter for Greenbids (prebid#9690)
  ...
  • Loading branch information
hankyates-maven committed Apr 28, 2023
2 parents ddbceb7 + 48a7e4a commit c16b80f
Show file tree
Hide file tree
Showing 475 changed files with 32,806 additions and 10,899 deletions.
2 changes: 2 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
ARG VARIANT="12"
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:${VARIANT}

RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor > /usr/share/keyrings/yarn-archive-keyring.gpg

# [Optional] Uncomment this section to install additional OS packages.
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
# && apt-get -y install --no-install-recommends <your-package-list-here>
Expand Down
3 changes: 2 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@

// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"nickdodd79.gulptasks"
"nickdodd79.gulptasks",
"dbaeumer.vscode-eslint"
],

// 9999 is web server, 9876 is karma
Expand Down
1 change: 0 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ module.exports = {
'import'
],
globals: {
'$$PREBID_GLOBAL$$': false,
'BROWSERSTACK_USERNAME': false,
'BROWSERSTACK_KEY': false,
'FEATURES': 'readonly',
Expand Down
43 changes: 27 additions & 16 deletions .github/workflows/issue_tracker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- name: Generate token
id: generate_token
uses: tibdex/github-app-token@021a2405c7f990db57f5eae5397423dcc554159c
uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
with:
app_id: ${{ secrets.ISSUE_APP_ID }}
private_key: ${{ secrets.ISSUE_APP_PEM }}
Expand All @@ -29,21 +29,30 @@ jobs:
gh api graphql -f query='
query($org: String!, $number: Int!) {
organization(login: $org){
projectNext(number: $number) {
projectV2(number: $number) {
id
fields(first:100) {
nodes {
id
name
settings
... on ProjectV2Field {
id
name
}
... on ProjectV2SingleSelectField {
id
name
options {
id
name
}
}
}
}
}
}
}' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV
echo 'DATE_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "'"$DATE_FIELD"'") | .id' project_data.json) >> $GITHUB_ENV
echo 'PROJECT_ID='$(jq '.data.organization.projectV2.id' project_data.json) >> $GITHUB_ENV
echo 'DATE_FIELD_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name=="'"$DATE_FIELD"'") | .id' project_data.json) >> $GITHUB_ENV
- name: Add issue to project
env:
Expand All @@ -52,9 +61,9 @@ jobs:
run: |
gh api graphql -f query='
mutation($project:ID!, $issue:ID!) {
addProjectNextItem(input: {projectId: $project, contentId: $issue}) {
projectNextItem {
id,
addProjectV2ItemById(input: {projectId: $project, contentId: $issue}) {
item {
id
content {
... on Issue {
createdAt
Expand All @@ -67,8 +76,8 @@ jobs:
}
}' -f project=$PROJECT_ID -f issue=$ISSUE_ID > issue_data.json
echo 'ITEM_ID='$(jq '.data.addProjectNextItem.projectNextItem.id' issue_data.json) >> $GITHUB_ENV
echo 'ITEM_CREATION_DATE='$(jq '.data.addProjectNextItem.projectNextItem.content.createdAt' issue_data.json) >> $GITHUB_ENV
echo 'ITEM_ID='$(jq '.data.addProjectV2ItemById.item.id' issue_data.json) >> $GITHUB_ENV
echo 'ITEM_CREATION_DATE='$(jq '.data.addProjectV2ItemById.item.content.createdAt' issue_data.json | cut -c 2-11) >> $GITHUB_ENV
- name: Set fields
env:
Expand All @@ -79,15 +88,17 @@ jobs:
$project: ID!
$item: ID!
$date_field: ID!
$date_value: String!
$date_value: Date!
) {
set_creation_date: updateProjectNextItemField(input: {
set_creation_date: updateProjectV2ItemFieldValue(input: {
projectId: $project
itemId: $item
fieldId: $date_field
value: $date_value
value: {
date: $date_value
}
}) {
projectNextItem {
projectV2Item {
id
}
}
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[![Build Status](https://circleci.com/gh/prebid/Prebid.js.svg?style=svg)](https://circleci.com/gh/prebid/Prebid.js)
[![Percentage of issues still open](http://isitmaintained.com/badge/open/prebid/Prebid.js.svg)](http://isitmaintained.com/project/prebid/Prebid.js "Percentage of issues still open")
[![Coverage Status](https://coveralls.io/repos/github/prebid/Prebid.js/badge.svg)](https://coveralls.io/github/prebid/Prebid.js)
[![Total Alerts](https://img.shields.io/lgtm/alerts/g/prebid/Prebid.js.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/prebid/Prebid.js/alerts/)

# Prebid.js

Expand Down
3 changes: 2 additions & 1 deletion features.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[
"NATIVE"
"NATIVE",
"VIDEO"
]
5 changes: 5 additions & 0 deletions integrationExamples/gpt/adloox.html
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,13 @@
realTimeData: {
auctionDelay: AUCTION_DELAY,
dataProviders: [
{
name: 'intersection',
waitForIt: true
},
{
name: 'adloox',
waitForIt: true,
params: { // optional, defaults shown
thresholds: [ 50, 60, 70, 80, 90 ],
slotinpath: false
Expand Down
Empty file modified integrationExamples/gpt/hello_world.html
100755 → 100644
Empty file.
129 changes: 129 additions & 0 deletions integrationExamples/gpt/lemma_sample.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
<!DOCTYPE html>
<html>

<head>
<meta name='viewport'
content='width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1'>
<style>
html,
body {
height: 100%;
margin: 0;
padding: 0;
overflow: hidden;
}

#lemmaAd {
height: 100% !important;
max-height: 100%;
text-align: center;
display: flex;
flex-direction: column;
justify-content: center;
resize: vertical;
margin: 0 auto;
position: relative;
object-fit: fill;
}
</style>
<script>
var PREBID_TIMEOUT = 3300;

var googletag = googletag || {};
googletag.cmd = googletag.cmd || [];

var bannerAdUnits = [{
code: 'banner-div',
mediaTypes: {
banner: {
sizes: [
[728, 90]
]
}
},
bids: [{
bidder: 'lemmadigital',
params: {
pubId: 975, // required
adunitId: '20134', // required
device_type: 2,
}
}]
}];
var videoAdUnits = [{
code: 'video1',
sizes: [
[1920, 1080]
],
mediaTypes: {
video: {
playerSize: [1920, 1080], // required
context: 'instream'
}
},
// Replace this object to test a new Adapter!
bids: [{
bidder: 'lemmadigital',
params: {
pubId: 975, // required
adunitId: '20134', // required
latitude: 34.9578,
longitude: -85.3012,
device_type: 3,
ifa: "ae59889b-d5bb-444b-892b-57057463d584",
video: {
minduration: 3,
maxduration: 300,
protocols: [
2,
3,
5,
6,
7,
8
],
skippable: true,
playback_method: ['auto_play_sound_off'],
mimes: ['video/x-flv',
"video/mp4",
"video/mpeg",
"video/ogg",
"video/webm",
"application/javascript"], // required
}
}
}]
}];
var pbjs = pbjs || {};
pbjs.que = pbjs.que || [];
</script>
<script async src="../../build/dev/prebid.js"></script>
<script>
pbjs.que.push(function () {
pbjs.setConfig({
debug: true
});
pbjs.addAdUnits(videoAdUnits);
pbjs.requestBids({
timeout: PREBID_TIMEOUT,
bidsBackHandler: function (bids) {
var highestCpmBids = pbjs.getHighestCpmBids('banner-div');
if (highestCpmBids.length) {
var doc = document.getElementById('banner-div');
pbjs.renderAd(doc.contentWindow.document, highestCpmBids[0].adId);
}
}
});
});

</script>
</head>

<body>
<div id='lemmaAd'>
<div id="banner-div"></div>
<iframe id='video1' frameBorder="0"></iframe>
</div>
</body>

</html>
Loading

0 comments on commit c16b80f

Please sign in to comment.