Merge pull request prebid#32 in AOLP_ADS_JS/prebid.js from release/1.…

…2.0 to master

* commit '40fdbed10c218a993df9e6665797b36f402ded18': (52 commits)
  Added new adapter for AOL analytics
  Fixed ES6 features which require a polyfill
  Updated CHANGELOG
  Fixed per-adapter timeouts
  Fixed sorting of per-adapter timeouts
  Added horizontal rule to delimit the original README part
  Link to the AOL documentation made more visible
  Fixed unit tests for AOL analytics
  Made changes required due to pull from Prebid official
  Updated README
  Updated LICENSE
  Reverted AOL branding
  restore url.js and modifcations to ajax.js (prebid#551)
  Log unsupported ad type only for good bids (prebid#547)
  use var ad instead of incorrect ads in rubicon adapter (prebid#546)
  Karma opens debug.html by default (prebid#540)
  Prebid 0.12.0 release
  Add tests for triplelift adapter. (prebid#531)
  allows multiple bids to be registered per a slot, related to prebid#496 (prebid#503)
  Add tests for aardvark adapter. (prebid#529)
  ...

.gitignore

@@ -7,6 +7,10 @@ test/app
 gpt.html
 gpt-each-bidder3.html
 
+# Selenium files
+bin
+selenium*.log
+
 # Dev File
 
 integrationExamples/gpt/gpt.html
@@ -70,3 +74,6 @@ crashlytics-build.properties
 
 # TypeScript typings
 typings/
+
+# MacOS system files
+.DS_Store

.nvmrc

@@ -0,0 +1 @@
+5.1

.travis.yml

@@ -5,6 +5,9 @@ node_js:
 
 before_install:
   - npm install -g gulp
+  - export CHROME_BIN=chromium-browser
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
 
 script:
-  - gulp build
+  - gulp run-tests

CHANGELOG

@@ -1,3 +1,10 @@
+AOL Prebid 1.2.0
+----------------
+Updated to Prebid 0.12.0.
+Fixed sorting of per-adapter timeouts.
+Fixed ES6 features which require a polyfill.
+
+
 AOL Prebid 1.1.0
 ----------------
 AOL adapter is optimized and heavily reduced in size.

LICENSE

@@ -181,16 +181,16 @@
       To apply the Apache License to your work, attach the following
       boilerplate notice, with the fields enclosed by brackets "[]"
       replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
+      the brackets!) The text should be enclosed in the appropriate
       comment syntax for the file format. We also recommend that a
       file or class name and description of purpose be included on the
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2013 APPNEXUS INC
+   Copyright 2016 AOL INC.
 
    Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
+   you may not use this software except in compliance with the License.
    You may obtain a copy of the License at
 
        http://www.apache.org/licenses/LICENSE-2.0
@@ -199,4 +199,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.