-
-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Branch: refs/heads/master Date: 2015-10-20T16:42:29-02:00 Author: hvelarde (hvelarde) <hector.velarde@gmail.com> Commit: plone/plone.app.layout@c9d0b80 Remove Chrome Frame from X-UA-Compatible HTTP header as it's deprecated Files changed: M CHANGES.rst M plone/app/layout/viewlets/httpheaders.py Repository: plone.app.layout Branch: refs/heads/master Date: 2015-10-21T10:15:13-05:00 Author: Nathan Van Gheem (vangheem) <vangheem@gmail.com> Commit: plone/plone.app.layout@5526493 Merge pull request #70 from plone/hvelarde-chrome-frame Remove Chrome Frame from X-UA-Compatible HTTP header as it's deprecated Files changed: M CHANGES.rst M plone/app/layout/viewlets/httpheaders.py
- Loading branch information
Showing
1 changed file
with
72 additions
and
50 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,86 +1,108 @@ | ||
| Repository: mockup | ||
| Repository: plone.app.layout | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2015-10-21T16:55:33+02:00 | ||
| Author: Gagaro (Gagaro) <gagaro42@gmail.com> | ||
| Commit: https://github.com/plone/mockup/commit/ba2184e8d2e0cacc01056d8e1d414cb5f9a09780 | ||
| Date: 2015-10-20T16:42:29-02:00 | ||
| Author: hvelarde (hvelarde) <hector.velarde@gmail.com> | ||
| Commit: https://github.com/plone/plone.app.layout/commit/c9d0b80822b8451c8109ad7d189ec6f53a0ed30a | ||
|
|
||
| fix: set widgets values for querystring pattern | ||
| Remove Chrome Frame from X-UA-Compatible HTTP header as it's deprecated | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
| M mockup/patterns/querystring/pattern.js | ||
| M plone/app/layout/viewlets/httpheaders.py | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index 977d81a..eed797b 100644 | ||
| index a1eca8a..8896138 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -26,6 +26,9 @@ Changelog | ||
| - Add the ``momentFormat`` option to the ``structure`` pattern. | ||
| [Gagaro] | ||
| @@ -4,6 +4,9 @@ Changelog | ||
| 2.5.16 (unreleased) | ||
| ------------------- | ||
|
|
||
| +- Set value for ``ReferenceWidget`` in querystring. | ||
| + [Gagaro] | ||
| +- Remove Chrome Frame from ``X-UA-Compatible`` HTTP header as it's deprecated. | ||
| + [hvelarde] | ||
| + | ||
| - fix icon rendering ... CMFPlone#1151 | ||
| [fgrcon] | ||
|
|
||
| 2.0.12 (2015-09-20) | ||
| @@ -11,7 +14,7 @@ Changelog | ||
| 2.5.15 (2015-09-20) | ||
| ------------------- | ||
| diff --git a/mockup/patterns/querystring/pattern.js b/mockup/patterns/querystring/pattern.js | ||
| index 1feffcb..3a72988 100644 | ||
| --- a/mockup/patterns/querystring/pattern.js | ||
| +++ b/mockup/patterns/querystring/pattern.js | ||
| @@ -253,6 +253,7 @@ define([ | ||
| } else if (widget === 'ReferenceWidget') { | ||
| self.$value = $('<input type="text"/>') | ||
| .addClass(self.options.classValueName + '-' + widget) | ||
| + .val(value) | ||
| .appendTo($wrapper) | ||
| .change(function() { | ||
| self.trigger('value-changed'); | ||
|
|
||
| -- Pull mark_special_links, external_links_open_new_window, | ||
| +- Pull mark_special_links, external_links_open_new_window, | ||
| types_view_action_in_listings values | ||
| from configuration registry. | ||
| [esteele] | ||
| diff --git a/plone/app/layout/viewlets/httpheaders.py b/plone/app/layout/viewlets/httpheaders.py | ||
| index 80f54a9..8fec707 100644 | ||
| --- a/plone/app/layout/viewlets/httpheaders.py | ||
| +++ b/plone/app/layout/viewlets/httpheaders.py | ||
| @@ -39,7 +39,7 @@ def getHeaders(self): | ||
|
|
||
|
|
||
| class XUACompatible(HeaderViewlet): | ||
| - """set the header ('X-UA-Compatible', 'IE=edge,chrome=1');""" | ||
| + """set the header ('X-UA-Compatible', 'IE=edge');""" | ||
|
|
||
| def getHeaders(self): | ||
| - return [('X-UA-Compatible', 'IE=edge,chrome=1')] | ||
| + return [('X-UA-Compatible', 'IE=edge')] | ||
|
|
||
|
|
||
| Repository: mockup | ||
| Repository: plone.app.layout | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2015-10-21T10:12:56-05:00 | ||
| Date: 2015-10-21T10:15:13-05:00 | ||
| Author: Nathan Van Gheem (vangheem) <vangheem@gmail.com> | ||
| Commit: https://github.com/plone/mockup/commit/98a6c92320f013afceaf44adf919e35e9fae4576 | ||
| Commit: https://github.com/plone/plone.app.layout/commit/55264932116831076535566e06966dca84543b54 | ||
|
|
||
| Merge pull request #600 from plone/fix-querystring-widget-values | ||
| Merge pull request #70 from plone/hvelarde-chrome-frame | ||
|
|
||
| fix: set widgets values for querystring pattern | ||
| Remove Chrome Frame from X-UA-Compatible HTTP header as it's deprecated | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
| M mockup/patterns/querystring/pattern.js | ||
| M plone/app/layout/viewlets/httpheaders.py | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index 977d81a..eed797b 100644 | ||
| index a1eca8a..8896138 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -26,6 +26,9 @@ Changelog | ||
| - Add the ``momentFormat`` option to the ``structure`` pattern. | ||
| [Gagaro] | ||
| @@ -4,6 +4,9 @@ Changelog | ||
| 2.5.16 (unreleased) | ||
| ------------------- | ||
|
|
||
| +- Set value for ``ReferenceWidget`` in querystring. | ||
| + [Gagaro] | ||
| +- Remove Chrome Frame from ``X-UA-Compatible`` HTTP header as it's deprecated. | ||
| + [hvelarde] | ||
| + | ||
| - fix icon rendering ... CMFPlone#1151 | ||
| [fgrcon] | ||
|
|
||
| 2.0.12 (2015-09-20) | ||
| @@ -11,7 +14,7 @@ Changelog | ||
| 2.5.15 (2015-09-20) | ||
| ------------------- | ||
| diff --git a/mockup/patterns/querystring/pattern.js b/mockup/patterns/querystring/pattern.js | ||
| index 1feffcb..3a72988 100644 | ||
| --- a/mockup/patterns/querystring/pattern.js | ||
| +++ b/mockup/patterns/querystring/pattern.js | ||
| @@ -253,6 +253,7 @@ define([ | ||
| } else if (widget === 'ReferenceWidget') { | ||
| self.$value = $('<input type="text"/>') | ||
| .addClass(self.options.classValueName + '-' + widget) | ||
| + .val(value) | ||
| .appendTo($wrapper) | ||
| .change(function() { | ||
| self.trigger('value-changed'); | ||
|
|
||
| -- Pull mark_special_links, external_links_open_new_window, | ||
| +- Pull mark_special_links, external_links_open_new_window, | ||
| types_view_action_in_listings values | ||
| from configuration registry. | ||
| [esteele] | ||
| diff --git a/plone/app/layout/viewlets/httpheaders.py b/plone/app/layout/viewlets/httpheaders.py | ||
| index 80f54a9..8fec707 100644 | ||
| --- a/plone/app/layout/viewlets/httpheaders.py | ||
| +++ b/plone/app/layout/viewlets/httpheaders.py | ||
| @@ -39,7 +39,7 @@ def getHeaders(self): | ||
|
|
||
|
|
||
| class XUACompatible(HeaderViewlet): | ||
| - """set the header ('X-UA-Compatible', 'IE=edge,chrome=1');""" | ||
| + """set the header ('X-UA-Compatible', 'IE=edge');""" | ||
|
|
||
| def getHeaders(self): | ||
| - return [('X-UA-Compatible', 'IE=edge,chrome=1')] | ||
| + return [('X-UA-Compatible', 'IE=edge')] | ||
|
|
||
|
|