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

Backport remove highlightsearchterms (wrong merge base) #2508

Closed
wants to merge 113 commits into from

Conversation

sunew
Copy link
Contributor

@sunew sunew commented Sep 6, 2018

Backport #1963 to 5.1.x

See also plone/plone.app.upgrade#170

ref #1811
ref #1801

mauritsvanrees and others added 30 commits October 21, 2017 16:25
If you add http://maurits.vanrees.org you only get a general message:
`There was an error submitting the form.`
On the backend you see a clearer error:
CompilerError: Unrecognized expression type "http".
So give an example with `string:`.
…e-51

Show example for expression in actions control panel.
update mockup with mockup#820
Accept only http/https, and doubly check escaped urls.
…l-5.1

Improved isURLInPortal according to PloneHotfix20171128. [5.1]
Require AccessControl 3.0.14 for this.
This uses `guarded_getitem` in str.format in restricted python code.
In the widget we need to go one level up before we can find the document to search for.
A couple of changelogs were merged and ended up under the already released 5.1rc2.

Also, reverted an accidental change of the minimum Zope version pin.
It was '> 2.13.0' and I accidentally made it '>='.

[ci skip]
Otherwise you get a `CatalogError`.
I get crazy sort_ons like '194' or 'null'.
Ignore invalid `sort_on` parameters in catalog `searchResults`. [5.1]
agitator and others added 26 commits June 12, 2018 11:59
Optional auto-login after passwort (re-)set.
Fixed tests when IRichText behavior is used.
* toolbar => fix js handling: fix references and bugs for margins and
positions of submenus

* compiled resources for plone-logged-in

* updated changelog
…istry-directory

Fixed combine-bundles step to work with keyword in registry directory.
@sunew sunew requested review from jensens and cdw9 September 6, 2018 17:55
@sunew sunew closed this Sep 6, 2018
@sunew sunew changed the title Backport remove highlightsearchterms Backport remove highlightsearchterms (wrong merge base) Sep 6, 2018
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.