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

Revert "Update pull request status script to python 3.6 [5.2]" #524

Merged
merged 1 commit into from
Oct 4, 2018

Conversation

gforcada
Copy link
Member

@gforcada gforcada commented Oct 4, 2018

Reverts #519

@gforcada gforcada merged commit fb7cf63 into 5.2 Oct 4, 2018
@gforcada gforcada deleted the revert-519-pull-request-update-py36 branch October 4, 2018 07:29
@gforcada gforcada restored the revert-519-pull-request-update-py36 branch October 4, 2018 07:29
@gforcada
Copy link
Member Author

gforcada commented Oct 4, 2018

Got sidetracked by other changes in jenkins.plone.org ... sorry for the noise!

mister-roboto pushed a commit that referenced this pull request Jun 14, 2019
Branch: refs/heads/master
Date: 2019-06-14T16:46:19+02:00
Author: Rodrigo Ferreira de Souza (rodfersou) <rodfersou@gmail.com>
Commit: plone/plone.app.contenttypes@da7b280

Support ILeadImage behavior when display collections

Files changed:
M CHANGES.rst
M plone/app/contenttypes/browser/collection.py
M plone/app/contenttypes/browser/folder.py
M plone/app/contenttypes/browser/templates/listing_album.pt
Repository: plone.app.contenttypes

Branch: refs/heads/master
Date: 2019-06-14T16:48:47+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.app.contenttypes@64b0e5f

Put changelog entry in news snippet.

Files changed:
A news/524.feature
M CHANGES.rst
M news/522.bugfix
Repository: plone.app.contenttypes

Branch: refs/heads/master
Date: 2019-06-14T16:49:14+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.app.contenttypes@a7151ac

Fixed robot test for collection album view.

'Test Image' used to appear three times:
- in the navigation
- as its own
- as image of the Test Folder
The first two are still there.
The last usually not, because with our leadimage changes, the Test News Item is usually picked as sample image for the Test Folder.
Which image is picked for that, does not seem entirely stable, but that is okay.
We look only for 'Test Image' as image title in a photoAlbumEntry which is not also a photoAlbumFolder.
That is what we already did for the other images, which also had a chance of being picked as sample image of their folder.

Files changed:
M plone/app/contenttypes/tests/robot/test_folderlisting.robot
Repository: plone.app.contenttypes

Branch: refs/heads/master
Date: 2019-06-14T18:14:20+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.app.contenttypes@faed5de

Merge pull request #524 from plone/collection-lead-image-master

Support ILeadImage behavior when display collections

Files changed:
A news/524.feature
M news/522.bugfix
M plone/app/contenttypes/browser/collection.py
M plone/app/contenttypes/browser/folder.py
M plone/app/contenttypes/browser/templates/listing_album.pt
M plone/app/contenttypes/tests/robot/test_folderlisting.robot
mister-roboto pushed a commit that referenced this pull request Dec 5, 2023
Branch: refs/heads/master
Date: 2023-12-05T11:51:36-03:00
Author: Érico Andrei (ericof) <ericof@gmail.com>
Commit: plone/plone.api@ba7327f

Fix 'api.portal.translate' usage with country-specific language codes (Fixes #524)

Files changed:
A news/524.bugfix
M src/plone/api/portal.py
M src/plone/api/tests/test_portal.py
Repository: plone.api

Branch: refs/heads/master
Date: 2023-12-05T12:41:43-03:00
Author: Érico Andrei (ericof) <ericof@gmail.com>
Commit: plone/plone.api@3feed99

Fix isort

Files changed:
M src/plone/api/portal.py
Repository: plone.api

Branch: refs/heads/master
Date: 2023-12-05T18:55:07+01:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.api@91825e3

Merge pull request #525 from plone/issue-524-translate

Fix 'api.portal.translate' usage with country-specific language codes

Files changed:
A news/524.bugfix
M src/plone/api/portal.py
M src/plone/api/tests/test_portal.py
mister-roboto pushed a commit that referenced this pull request Dec 5, 2023
Branch: refs/heads/master
Date: 2023-12-05T11:51:36-03:00
Author: Érico Andrei (ericof) <ericof@gmail.com>
Commit: plone/plone.api@ba7327f

Fix 'api.portal.translate' usage with country-specific language codes (Fixes #524)

Files changed:
A news/524.bugfix
M src/plone/api/portal.py
M src/plone/api/tests/test_portal.py
Repository: plone.api

Branch: refs/heads/master
Date: 2023-12-05T12:41:43-03:00
Author: Érico Andrei (ericof) <ericof@gmail.com>
Commit: plone/plone.api@3feed99

Fix isort

Files changed:
M src/plone/api/portal.py
Repository: plone.api

Branch: refs/heads/master
Date: 2023-12-05T18:55:07+01:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.api@91825e3

Merge pull request #525 from plone/issue-524-translate

Fix 'api.portal.translate' usage with country-specific language codes

Files changed:
A news/524.bugfix
M src/plone/api/portal.py
M src/plone/api/tests/test_portal.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant