Skip to content

Commit

Permalink
Merge branch 'main' into erral-login-options
Browse files Browse the repository at this point in the history
  • Loading branch information
erral authored Nov 13, 2024
2 parents b5c5899 + 4f3bb4f commit 730e8d2
Show file tree
Hide file tree
Showing 37 changed files with 914 additions and 451 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
- run: pip install virtualenv
- run: pip install wheel
- name: pip install
run: pip install -r requirements-${{ matrix.plone-version }}.txt -r requirements-docs.txt
run: pip install -r requirements-${{ matrix.plone-version }}.txt

# buildout
- name: buildout
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ build:
# If there are no changes (git diff exits with 0) we force the command to return with 183.
# This is a special exit code on Read the Docs that will cancel the build immediately.
- |
if [ "$READTHEDOCS_VERSION_TYPE" = "external" ] && git diff --quiet origin/main -- docs/ .readthedocs.yaml requirements-docs.txt requirements.txt;
if [ "$READTHEDOCS_VERSION_TYPE" = "external" ] && git diff --quiet origin/main -- docs/ src/plone/restapi/tests/http-examples/ .readthedocs.yaml requirements-docs.txt requirements.txt;
then
exit 183;
fi
Expand Down
64 changes: 64 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,70 @@ Changelog
.. towncrier release notes start
9.8.4 (2024-11-05)
------------------

Bug fixes:


- URL Management control panel: Fix error handling in CSV upload. @davisagli (#1837)


9.8.3 (2024-11-01)
------------------

Bug fixes:


- Fixed Plone Site serialization when there is a field with read_permission set. @ericof (#1830)


9.8.2 (2024-10-30)
------------------

Bug fixes:


- `@search` service: Remove parentheses from search query. @tedw87 (#1828)


9.8.1 (2024-10-23)
------------------

Bug fixes:


- Fix `ComponentLookupError` for `Products.CMFPlone.ManagePortalAliases` permission, which could happen depending on package load order. @davisagli (#1827)


9.8.0 (2024-10-23)
------------------

New features:


- Added create and fetch aliases in CSV format. @Faakhir30 (#1812)
- Site service: Indicate whether the site supports filtering URL aliases by date. @davisagli (#1826)


Bug fixes:


- Fix error getting allow_discussion value when p.a.discussion is not activated.
[maurits] (#1808)
- Fix incorrect condition for ``show_excluded_items`` setting in the ``@navigation`` API.
[mamico] (#1816)
- Fix response of `RelationListFieldSerializer` by filtering out invalid items. @Faakhir30 (#1818)
- Aliases endpoint: Use "Manage Portal Aliases" and "Manage Content Aliases" permissions. @jackahl (#1820)


Documentation:


- Use Plone Sphinx Theme for documentation. Build docs when there are changes to http-examples. @stevepiercy (#1815)
- Fixed spelling of prerequisites. @stevepiercy (#1822)


9.7.2 (2024-09-05)
------------------

Expand Down
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,13 @@ black: ## Black
zpretty: ## zpretty
if [ -f "bin/zpretty" ]; then zpretty -i ./**/*.zcml; fi

.PHONY: python-clean
python-clean: ## Clean Python virtual environment
rm -rf bin include lib

.PHONY: docs-clean
docs-clean: ## Clean current and legacy docs build directories, and Python virtual environment
docs-clean: ## Clean current and legacy docs build directories
cd $(DOCS_DIR) && rm -rf $(BUILDDIR)/
rm -rf bin include lib
rm -rf docs/build

.PHONY: docs-html
Expand Down
Loading

0 comments on commit 730e8d2

Please sign in to comment.