Skip to content
New issue

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

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

Already on GitHub? # to your account

the 3.2.x branch was deleted. we should now use 3.x #389

Merged
merged 1 commit into from
Jan 23, 2018

Conversation

thet
Copy link
Member

@thet thet commented Jan 23, 2018

No description provided.

@mauritsvanrees mauritsvanrees merged commit c50821e into 4.3 Jan 23, 2018
@mauritsvanrees mauritsvanrees deleted the thet-z3cformbranch-43 branch January 23, 2018 19:43
mister-roboto pushed a commit that referenced this pull request May 31, 2022
Branch: refs/heads/master
Date: 2021-04-27T19:47:45+02:00
Author: 1letter (1letter) <1letter@gmx.de>
Commit: plone/plone.app.multilingual@676405a

Update languageselector.pt Template

use plone 6 icon resolver

Files changed:
M src/plone/app/multilingual/browser/templates/languageselector.pt
Repository: plone.app.multilingual

Branch: refs/heads/master
Date: 2021-04-27T19:48:48+02:00
Author: 1letter (1letter) <1letter@gmx.de>
Commit: plone/plone.app.multilingual@79bfe17

Update Tests

- update Tests
- add new Test for checking svg icons in laguage selector

Files changed:
M src/plone/app/multilingual/tests/test_selector.py
Repository: plone.app.multilingual

Branch: refs/heads/master
Date: 2021-04-27T19:49:05+02:00
Author: 1letter (1letter) <1letter@gmx.de>
Commit: plone/plone.app.multilingual@6259d4d

Add towncrier message

Files changed:
A news/387.feature
Repository: plone.app.multilingual

Branch: refs/heads/master
Date: 2022-05-20T15:52:52+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.app.multilingual@03370fd

Merge branch 'master' into 1letter/svg-flag-support

Files changed:
A news/401.bugfix
A src/plone/app/multilingual/profiles/upgrades/to_1000/types/LIF.xml
A src/plone/app/multilingual/profiles/upgrades/to_1000/types/LRF.xml
M CHANGES.rst
M README.rst
M bootstrap.py
M docs/conf.py
M setup.cfg
M setup.py
M src/plone/__init__.py
M src/plone/app/__init__.py
M src/plone/app/multilingual/__init__.py
M src/plone/app/multilingual/api.py
M src/plone/app/multilingual/browser/add.py
M src/plone/app/multilingual/browser/controlpanel.py
M src/plone/app/multilingual/browser/edit.py
M src/plone/app/multilingual/browser/helper_views.py
M src/plone/app/multilingual/browser/interfaces.py
M src/plone/app/multilingual/browser/menu.py
M src/plone/app/multilingual/browser/migrator.py
M src/plone/app/multilingual/browser/modify.py
M src/plone/app/multilingual/browser/selector.py
M src/plone/app/multilingual/browser/setup.py
M src/plone/app/multilingual/browser/switcher.py
M src/plone/app/multilingual/browser/templates/modify_translations.pt
M src/plone/app/multilingual/browser/translate.py
M src/plone/app/multilingual/browser/update.py
M src/plone/app/multilingual/browser/utils.py
M src/plone/app/multilingual/browser/view.py
M src/plone/app/multilingual/browser/viewlets.py
M src/plone/app/multilingual/browser/vocabularies.py
M src/plone/app/multilingual/content/__init__.py
M src/plone/app/multilingual/content/lif.py
M src/plone/app/multilingual/content/lrf.py
M src/plone/app/multilingual/dx/__init__.py
M src/plone/app/multilingual/dx/cloner.py
M src/plone/app/multilingual/dx/directives.py
M src/plone/app/multilingual/dx/form.py
M src/plone/app/multilingual/dx/interfaces.py
M src/plone/app/multilingual/dx/language.py
M src/plone/app/multilingual/dx/schemaeditor.py
M src/plone/app/multilingual/dx/subscriber.py
M src/plone/app/multilingual/dx/supermodel.py
M src/plone/app/multilingual/events.py
M src/plone/app/multilingual/factory.py
M src/plone/app/multilingual/indexer.py
M src/plone/app/multilingual/interfaces.py
M src/plone/app/multilingual/itg.py
M src/plone/app/multilingual/manager.py
M src/plone/app/multilingual/permissions.py
M src/plone/app/multilingual/profiles/default/metadata.xml
M src/plone/app/multilingual/profiles/default/registry.xml
M src/plone/app/multilingual/profiles/default/types/LIF.xml
M src/plone/app/multilingual/profiles/default/types/LRF.xml
M src/plone/app/multilingual/setuphandlers.py
M src/plone/app/multilingual/shared_uuid.py
M src/plone/app/multilingual/subscriber.py
M src/plone/app/multilingual/testing.py
M src/plone/app/multilingual/tests/robot/test_add_translation.robot
M src/plone/app/multilingual/tests/test_alternates.py
M src/plone/app/multilingual/tests/test_api.py
M src/plone/app/multilingual/tests/test_catalog.py
M src/plone/app/multilingual/tests/test_directives.py
M src/plone/app/multilingual/tests/test_form.py
M src/plone/app/multilingual/tests/test_helper_views.py
M src/plone/app/multilingual/tests/test_lif.py
M src/plone/app/multilingual/tests/test_lrf.py
M src/plone/app/multilingual/tests/test_menu.py
M src/plone/app/multilingual/tests/test_robot.py
M src/plone/app/multilingual/tests/test_selector.py
M src/plone/app/multilingual/tests/test_setup.py
M src/plone/app/multilingual/tests/test_sitemap.py
M src/plone/app/multilingual/tests/test_subscribers.py
M src/plone/app/multilingual/tests/test_uninstall.py
M src/plone/app/multilingual/tests/test_vocabularies.py
M src/plone/app/multilingual/upgrades.py
M src/plone/app/multilingual/upgrades.zcml
D news/337.bugfix
Repository: plone.app.multilingual

Branch: refs/heads/master
Date: 2022-05-30T18:23:06+02:00
Author: Peter Holzer (agitator) <peter.holzer@agitator.com>
Commit: plone/plone.app.multilingual@f617e56

use json dumps with sort_keys for better comparability and fix tests

Files changed:
M src/plone/app/multilingual/tests/test_selector.py
Repository: plone.app.multilingual

Branch: refs/heads/master
Date: 2022-05-31T11:15:57+02:00
Author: Peter Mathis (petschki) <petschki@users.noreply.github.com>
Commit: plone/plone.app.multilingual@896f444

Merge pull request #389 from plone/1letter/svg-flag-support

1letter/svg flag support

Files changed:
A news/387.feature
M src/plone/app/multilingual/browser/templates/languageselector.pt
M src/plone/app/multilingual/tests/test_selector.py
mister-roboto pushed a commit that referenced this pull request May 7, 2024
Branch: refs/heads/master
Date: 2024-03-06T21:34:27+01:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.app.event@a44933c

Conditionally load the zcml for our portlets.

Only load them when plone.app.portlets is available and Classic UI is wanted.
This is the default in Plone 6, but may be switched off in 6.1.
In Plone 7 this won't be the default.

See plone/Products.CMFPlone#3923

Files changed:
A news/3923.bugfix
M plone/app/event/configure.zcml
Repository: plone.app.event

Branch: refs/heads/master
Date: 2024-05-07T14:14:24+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.app.event@e248da7

Merge pull request #389 from plone/maurits-conditional-portlets

Conditionally load the zcml for our portlets.

Files changed:
A news/3923.bugfix
M plone/app/event/configure.zcml
mister-roboto pushed a commit that referenced this pull request May 7, 2024
Branch: refs/heads/master
Date: 2024-03-06T21:34:27+01:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.app.event@a44933c

Conditionally load the zcml for our portlets.

Only load them when plone.app.portlets is available and Classic UI is wanted.
This is the default in Plone 6, but may be switched off in 6.1.
In Plone 7 this won't be the default.

See plone/Products.CMFPlone#3923

Files changed:
A news/3923.bugfix
M plone/app/event/configure.zcml
Repository: plone.app.event

Branch: refs/heads/master
Date: 2024-05-07T14:14:24+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.app.event@e248da7

Merge pull request #389 from plone/maurits-conditional-portlets

Conditionally load the zcml for our portlets.

Files changed:
A news/3923.bugfix
M plone/app/event/configure.zcml
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants