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

V9: Merge v8 29-10-2021 #11538

Merged
merged 56 commits into from
Oct 29, 2021
Merged

V9: Merge v8 29-10-2021 #11538

merged 56 commits into from
Oct 29, 2021

Conversation

bergmania
Copy link
Member

No description provided.

ronaldbarendse and others added 30 commits October 13, 2021 13:32
* Align template picking more towards the other pickers

* style/cleanup - remove unused args, updated openItemPicker function name to openTemplatePicker since that's what we're opening

Co-authored-by: Nathan Woulfe <[email protected]>
* Added a link to 404 documentation

I think it will be useful to include a link to the documentation on how to create a custom 404

* added localized titles to the search and help buttons in the app header (top right of Umbraco)
Add Constants.Sql.MaxParameterCount and update query logic
* Update nl.xml add addTab key

* tab to tablad

* Add translation to shortcuts sections

(cherry picked from commit d222972)
BatJan and others added 26 commits October 27, 2021 09:18
* Pass in invalid files

* Fix pattern and accept udt file extension

* Remove wildcard

* fix help text - referred to 'browse' button, which does not exist

Co-authored-by: Nathan Woulfe <[email protected]>
…_29-10-2021

# Conflicts:
#	src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/importdocumenttype.html
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
@bergmania bergmania merged commit 7aea361 into v9/dev Oct 29, 2021
@bergmania bergmania deleted the v9/feature/merge-v8_29-10-2021 branch October 29, 2021 08:48
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.

9 participants