Code

Fix failing circle-ci build job.#4840

Code

Merged

jsnellbaker merged 21 commits intomasterprebid/Prebid.js:masterfrom fix/circle-ciprebid/Prebid.js:fix/circle-ciCopy head branch name to clipboardMar 17, 2020

+499-298

Commits

Commits on Feb 11, 2020

• fix lint errors

  Fawke

  committed
  fb8a448

  Copy full SHA for fb8a448

• update browser versions

  Fawke

  committed
  aea363c

  Copy full SHA for aea363c

Commits on Feb 13, 2020

• remove problematic test cases

  Fawke

  committed
  4ca2c1c

  Copy full SHA for 4ca2c1c

• remove addtional files

  Fawke

  committed
  fac73d8

  Copy full SHA for fac73d8

Commits on Feb 18, 2020

• fix errors in adagioBidAdapter.js and adagioBidAdapter_spec.js file

  Fawke

  committed
  2399e97

  Copy full SHA for 2399e97

Commits on Feb 24, 2020

• change karma config

  Fawke

  committed
  93e262b

  Copy full SHA for 93e262b

• add back deleted spec files

  Fawke

  committed
  2927d97

  Copy full SHA for 2927d97

Commits on Feb 28, 2020

• change config

  Fawke

  committed
  ef76c54

  Copy full SHA for ef76c54

• Merge branch 'master' of https://github.com/prebid/Prebid.js into fix/circle-ci

  Fawke

  committed
  bcd3f77

  Copy full SHA for bcd3f77

Commits on Mar 4, 2020

• Merge branch 'master' into fix/circle-ci

  Fawke

  committed
  c265d1d

  Copy full SHA for c265d1d

• update timeout values

  Fawke

  committed
  cc2c883

  Copy full SHA for cc2c883

Commits on Mar 5, 2020

• resolve merge conflict

  Fawke

  committed
  6344a15

  Copy full SHA for 6344a15

• Merge branch 'master' into fix/circle-ci

  Fawke

  committed
  2ef66c5

  Copy full SHA for 2ef66c5

• -update karma\n-fix userIdSpec unit tests\n-update version of karma-browserstack-launcher to 1.4.0

  Fawke

  committed
  04b4f5b

  Copy full SHA for 04b4f5b

Commits on Mar 6, 2020

• Merge branch 'master' into fix/circle-ci

  Fawke

  committed
  855b4cf

  Copy full SHA for 855b4cf

Commits on Mar 11, 2020

• fix issue with userId_spec.js file

  Fawke

  committed
  1cdc45c

  Copy full SHA for 1cdc45c

• sync with master

  Fawke

  committed
  733a5bd

  Copy full SHA for 733a5bd

Commits on Mar 13, 2020

• fix for realvu and sortable, potential fix for userId

  Fawke

  committed
  3770dfb

  Copy full SHA for 3770dfb

• merge with master

  Fawke

  committed
  4cde05b

  Copy full SHA for 4cde05b

• resolve faulty merge

  Fawke

  committed
  db32111

  Copy full SHA for db32111

Commits on Mar 15, 2020

• add a guideline to CONTRIBUGING.md and revert auction time back in userId_spec.js file

  Fawke

  committed
  0bbded5

  Copy full SHA for 0bbded5