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

7/11 master -> stable #204

Merged
merged 59 commits into from
Jul 11, 2013
Merged

7/11 master -> stable #204

merged 59 commits into from
Jul 11, 2013

Conversation

dfreedm
Copy link
Member

@dfreedm dfreedm commented Jul 11, 2013

No description provided.

Scott J. Miles and others added 30 commits June 14, 2013 00:18
slight refactoring
cc1a5c3
Merge branch 'master' of https://github.com/Polymer/polymer
dff8b03
Merge branch 'master' of https://github.com/Polymer/polymer
0d9d3cb 
Conflicts:
	src/register.js
refactor polymer into polymer-element
e331ea7
refactor polymer into polymer-element
ccb8377
folderize modules
b081136
folderize modules
fbae382
@dfreedm
remove broken submodule
35e59ab
@dfreedm
update tools repo
960b6b1
re-conceive technique for inheriting object-valued properties
7c79421
Merge branch 'polymer-element' of https://github.com/Polymer/polymer …
b5cb903 
…into polymer-element
simulate a DOM registry of tag-names to prototypes for inheritance
bf640fd
fix inherited PUBLISHED, logging tweaks
f077111
@sorvell
reduce unbind asynchrony, makes testing easier. Revert if there's a g…
f41cb65 
…ood reason for longer delay.
@sorvell
fix incorrect argument signature
e5c7907
@sorvell
adapt to new element properties
78f0850
@sorvell
update tests (sip)
bdc0638
remove browserstack test config
e9e4532
test: update karma config
3a8ac06
@frankiefu
make publish block works
e4cd286
@frankiefu
supports attributeChanged
4bef9a7
@frankiefu
update tests for polymer-element (comment out styling/host.html test for
2c8c03c 
now)
@frankiefu
add fouc prevention
b7c5820
@sorvell
update test
c365003
@frankiefu
fix mismatch arguments in unbindProperty
a1bc22a
@sorvell
rename propertyChanged to dispatchPropertyChange to avoid conflicting…
42d1a32 
… with a property named property.
@sorvell
only publish the ownProperty publish block on the element prototype. …
6271e97 
…This ensures we do not override a prototype value with an inherited published value.
@sorvell
add bind reflection api: Polymer.getBinding
017f4e1
@frankiefu
there is a templateContent() on the element, so use that in shimStyling
4cccdf7
@dfreedm
Merge pull request #192 from Polymer/polymer-element
dbed5fe 
Switch to <polymer-element>
frankiefu and others added 28 commits June 26, 2013 18:46
@frankiefu
add test for inline script before polymer-element
723789b
@dfreedm
ignore builds
04edcca
slight factoring to improve template customization hooks
6f32d97
update gruntfile.js for new src structure
d64626d
@ebidel
Update CONTRIBUTING.md
f8148b8
refactoring for micro-optimizations; make custom property finding a p…
7936ff8 
…reprocess step
@sorvell
update grunt file list.
af0a37d
@dfreedm
remove PointerEventsPolyfill.setTouchAction, it no longer necessary
5e3c09c
test: add new src files to test config
ae70a41
@ebidel
Fixes issue #199
cfeb272
@ebidel
Correct test to check global div
48c0f09
@ebidel
Adding test for applyAuthorStyles/resetStyleInheirtance
11acb3a
@ebidel
additional tests
ef2c3d3
@sorvell
remove bind tracking
fdbea70
@sorvell
ShadowCSS moved to Platform
ae24b2a
@sorvell
move styling test to platform repo
6549f3e
@sorvell
shim styling under ShadowDOMPolyfill
a15d38d
test: add missing files to test config
9dd82a9
@sorvell
remove deleted tests (these test moved to platform repo)
e9ef557
@frankiefu
Merge pull request #200 from ebidel/resetStyleInheritance-feature
411d53c 
Fixes issue #199 - adds support for resetStyleInheritance on prototype
@frankiefu
Merge pull request #201 from ebidel/fixtest
df788c3 
Correct test to check global div
@frankiefu
fix issue in calling shimStyling but the element has no template
0c75227
@sorvell
ensure style elements maintain scoping attribute
f7d65cb
@sorvell
handle stylesheets more uniformly.
91d0de4
@sorvell
controller styles supports inheritance.
1dad984
@sorvell
update based on mdv changes: override createBinding instead of bind/u…
5a6a6fe 
…nbind.
@sorvell
bindProperty returns observer; track properties only, not bindings (t…
a10220d 
…hese are now handled by mdv)
@sorvell
update tests
aec805f
dfreedm added a commit that referenced this pull request Jul 11, 2013
@dfreedm
Merge pull request #204 from Polymer/master
0b8de69 
7/11 master -> stable
@dfreedm dfreedm merged commit 0b8de69 into stable Jul 11, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@dfreedm @nodirt @sorvell @frankiefu @ebidel