Skip to content

Commit

Permalink
[fc] Repository: Products.CMFPlone
Browse files Browse the repository at this point in the history
Branch: refs/heads/master
Date: 2022-05-17T12:08:36+02:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/Products.CMFPlone@5909d9f

tinymce pat settings from image_scales to image_srcsets

Files changed:
A news/3477.feature
M Products/CMFPlone/patterns/settings.py
Repository: Products.CMFPlone

Branch: refs/heads/master
Date: 2022-05-17T12:08:36+02:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/Products.CMFPlone@15ba17e

filter out srcsets with hideInEditor set to true

Files changed:
M Products/CMFPlone/patterns/settings.py
Repository: Products.CMFPlone

Branch: refs/heads/master
Date: 2022-05-17T12:08:36+02:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/Products.CMFPlone@2b28f0a

add imageCaptioningEnabled param to TinyMCE settings

Files changed:
M Products/CMFPlone/patterns/settings.py
Repository: Products.CMFPlone

Branch: refs/heads/master
Date: 2022-05-17T12:09:56+02:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/Products.CMFPlone@2dd5c11

tinymce pat settings from image_scales to image_srcsets

Files changed:
M Products/CMFPlone/patterns/settings.py
Repository: Products.CMFPlone

Branch: refs/heads/master
Date: 2022-05-17T12:13:06+02:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/Products.CMFPlone@49949b8

filter out srcsets with hideInEditor set to true

Files changed:
M Products/CMFPlone/patterns/settings.py
Repository: Products.CMFPlone

Branch: refs/heads/master
Date: 2022-06-01T18:17:21+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/Products.CMFPlone@6cb1365

Merge remote-tracking branch 'remotes/origin/mrtango-image-handling-sourcesets-settings' into mrtango-image-handling-sourcesets-settings

Files changed:
A news/1178.feature
A news/3533.bugfix
M Products/CMFPlone/controlpanel/browser/redirects.py
M Products/CMFPlone/resources/utils.py
Repository: Products.CMFPlone

Branch: refs/heads/master
Date: 2022-06-07T17:27:08+03:00
Author: MrTango (MrTango) <md@derico.de>
Commit: plone/Products.CMFPlone@f16f386

rename image_srcsets to picture_variants

Files changed:
M Products/CMFPlone/patterns/settings.py
Repository: Products.CMFPlone

Branch: refs/heads/master
Date: 2022-06-08T23:42:00+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/Products.CMFPlone@28d1ea6

Merge branch 'master' into mrtango-image-handling-sourcesets-settings

Files changed:
A news/3528.feature
A news/3539.bugfix
M Products/CMFPlone/browser/admin.py
M Products/CMFPlone/browser/templates/plone-upgrade.pt
M Products/CMFPlone/tests/robot/test_controlpanel_actions.robot
M Products/CMFPlone/tests/robot/test_controlpanel_filter.robot
M Products/CMFPlone/tests/robot/test_controlpanel_navigation.robot
M Products/CMFPlone/tests/robot/test_controlpanel_search.robot
M Products/CMFPlone/tests/robot/test_controlpanel_security.robot
M Products/CMFPlone/tests/robot/test_controlpanel_site.robot
M Products/CMFPlone/tests/robot/test_controlpanel_social.robot
M Products/CMFPlone/tests/robot/test_edit_user_schema.robot
M Products/CMFPlone/tests/robot/test_linkintegrity.robot
M Products/CMFPlone/tests/robot/test_livesearch.robot
M Products/CMFPlone/tests/robot/test_querystring.robot
M Products/CMFPlone/tests/robot/test_tinymce.robot
M Products/CMFPlone/tests/testResourceRegistries.py
Repository: Products.CMFPlone

Branch: refs/heads/master
Date: 2022-06-09T22:32:39+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/Products.CMFPlone@40be913

Restore imageScales / image_scales in patterns settings.

Otherwise the new code with picture variants is only used when you have the right mockup branch,
and mockup running, and the resource registries setup to use it,
or the mockup changes should have landed in plone.staticresources already.

Note that the breakage is not too bad though:
if imageScales is not in the patterns settings and you still have TinyMCE from old staticresources,
then TinyMCE will still work.  It will just use an internal copy of the imageScales,
which for example is missing the new greater and huge scales.
With the current commit, we support both old and new TinyMCE, as long as we think this is needed.

Files changed:
M Products/CMFPlone/patterns/settings.py
Repository: Products.CMFPlone

Branch: refs/heads/master
Date: 2022-06-09T22:40:24+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/Products.CMFPlone@a1c4159

Merge branch 'master' into mrtango-image-handling-sourcesets-settings

Files changed:
A news/3555.bugfix
M Products/CMFPlone/profiles/default/actions.xml
M Products/CMFPlone/tests/robot/test_querystring.robot
Repository: Products.CMFPlone

Branch: refs/heads/master
Date: 2022-06-10T12:23:40+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/Products.CMFPlone@d416cd1

Fix white space problem in browser_collection_views.txt.

With newer plone.outputfilters the spacing is slightly different.

Files changed:
M Products/CMFPlone/tests/browser_collection_views.txt
Repository: Products.CMFPlone

Branch: refs/heads/master
Date: 2022-06-13T12:00:30+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/Products.CMFPlone@8b566c5

Merge branch 'master' into mrtango-image-handling-sourcesets-settings

Files changed:
A Products/CMFPlone/browser/static/plone-logo.svg
A news/3558.feature
M Products/CMFPlone/browser/configure.zcml
M Products/CMFPlone/browser/templates/plone-addsite.pt
M Products/CMFPlone/browser/templates/plone-admin-logged-out.pt
M Products/CMFPlone/browser/templates/plone-overview.pt
M Products/CMFPlone/browser/templates/plone-upgrade.pt
M Products/CMFPlone/tests/test_utils.py
M Products/CMFPlone/utils.py
Repository: Products.CMFPlone

Branch: refs/heads/master
Date: 2022-06-16T18:54:19+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/Products.CMFPlone@c7433f6

Merge pull request #3477 from plone/mrtango-image-handling-sourcesets-settings

Add image srcset's configuration to TinyMCE pattern settings

Files changed:
A news/3477.feature
M Products/CMFPlone/patterns/settings.py
M Products/CMFPlone/tests/browser_collection_views.txt
  • Loading branch information
mauritsvanrees committed Jun 16, 2022
1 parent a772fd7 commit 7cdc8d0
Showing 1 changed file with 137 additions and 391 deletions.
Loading

0 comments on commit 7cdc8d0

Please sign in to comment.