Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Flatten repos #174

Merged
merged 7 commits into from
Jun 7, 2013
Merged

Flatten repos #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
277ea16
remove platform submodule
May 31, 2013
36ffd01
update paths for flattened repos
May 31, 2013
51d97d3
modify to use Platform.mixin instead of window.mixin
Jun 6, 2013
821bdf3
add 'constructor' to cloned-attribute blacklist, make that blacklist …
Jun 6, 2013
d4f2d60
Merge branch 'master' into flattened-repos
dfreedm Jun 6, 2013
4d32e06
rebuild
dfreedm Jun 6, 2013
6877360
update build
dfreedm Jun 7, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,4 @@
url = https://github.com/Polymer/buildbot.git
[submodule "tools"]
path = tools
url = https://github.com/Polymer/tools.git
[submodule "platform"]
path = platform
url = https://github.com/Polymer/platform.git
branch = master
url = https://github.com/Polymer/tools.git
1 change: 0 additions & 1 deletion conf/karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ files = [
'polymer.js',
'test/js/*.js',
{pattern: 'tools/**/*.js', included: false},
{pattern: 'platform/**/*', included: false},
{pattern: 'src/*.js', included: false},
{pattern: 'test/**/*.html', included: false},
{pattern: 'test/**/*.css', included: false},
Expand Down
6 changes: 3 additions & 3 deletions gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
*/
module.exports = function(grunt) {
Platform = [
'platform/platform.min.js'
'../platform/platform.min.js'
];

PlatformNative = [
'platform/platform.native.min.js'
'../platform/platform.native.min.js'
];

PlatformSandbox = [
'platform/platform.sandbox.min.js'
'../platform/platform.sandbox.min.js'
];

Polymer = [
Expand Down
1 change: 0 additions & 1 deletion platform
Open in desktop
Submodule platform deleted from 704bce
2 changes: 1 addition & 1 deletion polymer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
var thisFile = 'polymer.js';
var scopeName = 'Polymer';
var modules = [
'platform/platform.js',
'../platform/platform.js',
'src/lang.js',
'src/oop.js',
'src/register.js',
Expand Down
8 changes: 4 additions & 4 deletions polymer.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion polymer.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions polymer.native.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion polymer.native.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

Loading