Skip to content

Commit

Permalink
Merge pull request #4372 from Polymer/2.0-preview
Browse files Browse the repository at this point in the history
Merge 2.0-preview to master
  • Loading branch information
dfreedm authored Mar 4, 2017
2 parents 80c899f + 69ce497 commit 375ab2e
Show file tree
Hide file tree
Showing 321 changed files with 27,764 additions and 36,856 deletions.
4 changes: 2 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
src/**/demo/*
src/**/experimental/*
node_modules/*
bower_components/*
18 changes: 12 additions & 6 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
{
"extends": "eslint:recommended",
"ecmaVersion": 6,
"rules": {
"no-console": 0
"no-console": "off",
"no-var": "error",
"strict": "error"
},
"env": {
"browser": true
"browser": true,
"es6": true
},
"plugins": [
"html"
],
"globals": {
"CustomElements": false,
"HTMLImports": false,
"Polymer": false,
"WeakMap": false
"customElements": true,
"HTMLImports": true,
"Polymer": true,
"ShadyDOM": true,
"ShadyCSS": true,
"goog": true
}
}
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@ before_script:
- npm install -g bower gulp-cli@1
- bower install
- gulp lint
- gulp switch
script:
- xvfb-run wct
- if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then wct -s default; fi
- if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then wct -s 'windows 10/microsoftedge@14' -s 'windows 8.1/internet explorer@11' -s 'os x 10.11/safari@9' -s 'macos 10.12/safari@10' -s 'Linux/chrome@41'; fi
env:
global:
- secure: bfF/o1ewpOxDNqTzWfvlwgRgGfP8OXhSQLLdEwZ6izO9tckMJuSNghk3qBXCEQJwTcUEyXP6EqfzIrRAvDXPa0H3OoinbrooDyV2wIDaVRK++WR2iZIqzqo3hGOdzm4tdrGJZe5av5Rk661Hls8aPfLbjdzcGuYXi8B4wZq2xMI=
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2014 The Polymer Authors. All rights reserved.
// Copyright (c) 2017 The Polymer Authors. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
Expand Down
Loading

0 comments on commit 375ab2e

Please sign in to comment.