Skip to content

Commit

Permalink
Merge pull request #6 from adform/SSP-910_Switch_to_latest_stable_pre…
Browse files Browse the repository at this point in the history
…bid_version

Switch to latest stable prebid version
  • Loading branch information
evercoinx authored Jun 20, 2016
2 parents 8bac68b + 1bc8f32 commit 89e00f7
Show file tree
Hide file tree
Showing 79 changed files with 12,114 additions and 16,717 deletions.
4 changes: 4 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"presets": ["es2015"],
"plugins": ["transform-object-assign"]
}
125 changes: 71 additions & 54 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,54 +1,71 @@
node_modules/


# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion

*.iml

## Directory-based project format:
.idea/
# if you remove the above rule, at least ignore the following:

# User-specific stuff:
# .idea/workspace.xml
# .idea/tasks.xml
# .idea/dictionaries

# Sensitive or high-churn files:
# .idea/dataSources.ids
# .idea/dataSources.xml
# .idea/sqlDataSources.xml
# .idea/dynamic.xml
# .idea/uiDesigner.xml

# Gradle:
# .idea/gradle.xml
# .idea/libraries

# Mongo Explorer plugin:
# .idea/mongoSettings.xml

## File-based project format:
*.ipr
*.iws

## Plugin-specific files:

# IntelliJ
/out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
*.swp
*.swo

#zip files (for releases)
*.zip
# Built Files
node_modules/
build

# Test Files
test/app
gpt.html
gpt-each-bidder3.html

# Dev File

integrationExamples/gpt/gpt.html
integrationExamples/implementations/

# Coverage reports
build/coverage/

# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion

*.iml

## Directory-based project format:
.idea/
# if you remove the above rule, at least ignore the following:

# User-specific stuff:
# .idea/workspace.xml
# .idea/tasks.xml
# .idea/dictionaries

# Sensitive or high-churn files:
# .idea/dataSources.ids
# .idea/dataSources.xml
# .idea/sqlDataSources.xml
# .idea/dynamic.xml
# .idea/uiDesigner.xml

# Gradle:
# .idea/gradle.xml
# .idea/libraries

# Mongo Explorer plugin:
# .idea/mongoSettings.xml

## File-based project format:
*.ipr
*.iws

## Plugin-specific files:

# IntelliJ
/out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
*.swp
*.swo

#zip files (for releases)
*.zip

# TypeScript typings
typings/
11 changes: 11 additions & 0 deletions .jscsrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"maxErrors": 1000,
"requireTrailingComma": null,
"requireCamelCaseOrUpperCaseIdentifiers": null,
"requireSpacesInAnonymousFunctionExpression": null,
"validateIndentation": 2,
"disallowSpacesInFunctionDeclaration": {
"beforeOpeningRoundBrace": true
},
"disallowNewlineBeforeBlockStatements": true
}
38 changes: 38 additions & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"bitwise": false,
"browser": true,
"curly": false,
"devel": true,
"eqeqeq": true,
"freeze": true,
"immed": true,
"maxdepth": 5,
"newcap": true,
"noarg": true,
"node": true,
"notypeof": true,
"esnext": true,
"trailing": true,
"undef": true,
"unused": true,
"strict": false,
"scripturl": true,
"globals": {
"before": true,
"after": true,
"exports": true,
"pbjs": true,
"pbjsTestOnly": true,
"assert": false,
"expect": false,
"dump": false,
"describe": false,
"it": false,
"xit": false,
"pkg": false,
"sinon": false,
"beforeEach": false,
"afterEach": false,
"JSON": true
}
}
21 changes: 10 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
language: node_js

node_js:
- 0.12
- 0.11

before_install:
- npm install -g gulp

script:
- gulp build
language: node_js

node_js:
- "5.1"

before_install:
- npm install -g gulp

script:
- gulp build
Loading

0 comments on commit 89e00f7

Please sign in to comment.