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.

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

Picks from master to 1.0 #7265

Merged
merged 4 commits into from
Jan 3, 2020
Merged

Picks from master to 1.0 #7265

merged 4 commits into from
Jan 3, 2020

Conversation

mehdi-vaadin
Copy link
Contributor

@mehdi-vaadin mehdi-vaadin commented Jan 2, 2020

This change is Reviewable

peholmst and others added 4 commits January 2, 2020 16:57
Add support to the StaticFileServer for understanding incorrect webjar paths generated by the production build.

(cherry picked from commit b70c575)
(cherry picked from commit debbbc8)
If we remove all when the innerHTML
value stays the same we will loose the innerHTML
on the client as the value is not re-sent,
but is still cleared from the client.

Fixes #4644

(cherry picked from commit efdc44a)
@mehdi-vaadin mehdi-vaadin marked this pull request as ready for review January 3, 2020 04:53
@joheriks joheriks self-requested a review January 3, 2020 07:08
Copy link
Contributor

@joheriks joheriks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 2 of 2 files at r1, 1 of 2 files at r2, 4 of 4 files at r3.
Reviewable status: :shipit: complete! all discussions resolved, 1 of 1 LGTMs obtained

@joheriks joheriks merged commit 826a312 into 1.0 Jan 3, 2020
@joheriks joheriks deleted the picks/from-master-to-1.0 branch January 3, 2020 08:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants