Merge v10/contrib into v10/dev
#12682
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Async support for content finders. Improve log performance. * Improve redirect contentfinder scalablilty with async calls to the database
* Introducing a new Snippet type * Adding a SnippetCollection and SnippetCollectionBuilder * Using snippetCollection to get the snippets instead of fileService * Fixed fetching the correct content * Make ISnippet non-discoverable * Split the SnippetCollection into PartialViewSnippetCollection and PartialViewMacroSnippetCollection * Update CodeFileController to use the 2 snippet collections * Display the names with Empty.cshtml on top * Remove merging embedded snippets with custom snippets from ~\Umbraco.Web.UI\umbraco\PartialViewMacros\Templates folder for the Partial View Collection * Fix naming * Fix another naming * Cleanup + Use base items Co-authored-by: Bjarke Berg <[email protected]>
…12140) * Show nicer overlay when clicking block card for deleted element type * Cleanup * Remove stop-scrolling container * Use flex-start instead on start * Remove legacy flexbox fallback * Remove unnecessary hack * Use standard gap property instead * Localization of message * Fix translation * End sentence with a dot
as we discovered some changes we needed in the docs
* Support custom SVG icon in menu item with legacy support * Update menu icons * Update action icons * Adjust icons in menu actions with legacy fallback * Don't use legacy icon * Update comments
* Updated the installer screen, and the no NoNodes.cshtml with link to the new learning base for Umbraco * Added ref to the link Co-authored-by: Dennis Aaen <[email protected]>
* Fix icon for export member * Add missing start summary tag * Formatting
* Support SVG icon in umb-property-actions * Update icons for existing property actions * Make backwards compatible * Update existing property actions to not use legacy icons as we now specify full icon name, but we need this for backward compatibility * Change from named function to local function * Add property actions to multi url picker * Inject overlayService and set isDisabled in watch * Add function to clear
* Adjust Danish translation for 2FA * Remove break
* added option to disable automatic expand of single nc item * remove max item conditional remove max item 1 conditional to set current node * changed description of slider property removed description of first item conditional * Update NestedContentConfiguration.cs change copy to more accurately describe the feature Co-authored-by: Wilmar <[email protected]>
* Fixed null check typo. Fixes #12473. * Removed unneccessary null forgiving operator Co-authored-by: Johan Runsten <[email protected]>
#12424) * Update template gitignore Remove the rules for umbraco static assets as these are now served from a Razor Class Libray * Update .gitignore Adjust path of appsettings-schema.json
…wedish) Add 'Create a new Document Type' key in button area (Swedish translation file)
* Added dictionary import/export * Added umb tree to dictionary import & level for displaying preview dictionary import * Indented dictionaries for import, added new text for choosing where to import dictionary items * Removed console.log for dictionary/import.controller.js Co-authored-by: Michael <[email protected]>
* Allow action links to wrap Preventing wrapping means that buttons can overflow their container. * slightly wider context menu to reduce runty labels Co-authored-by: Nathan Woulfe <[email protected]>
* add a gap between icon and label of media menu * replace inline style with class * icon alignment Co-authored-by: Nathan Woulfe <[email protected]>
* Remove unused using * Remove Obsolete AddOEmbedProvider Method * Revert and update obsolete message
Ensuring that MemberManager.ConfirmEmailAsync persists.
Add break word to avoid overflowing content / account for label values which are often used to store random data
* set isInfoTab to true if active tab is info tab * replace underscore functions with good old boring javascript Co-authored-by: Nathan Woulfe <[email protected]>
* Add Current Server Rule to system information * Update Unit Tests, Mock IServerRoleAccessor * Add CurrentServerRole to UnitTest * adds trailing commas Co-authored-by: Nathan Woulfe <[email protected]>
* Support localization for content search * Formatting Co-authored-by: Nikolaj Geisle <[email protected]> * Review changes * Review changes Co-authored-by: kjac <[email protected]> Co-authored-by: Nikolaj Geisle <[email protected]>
…on (#11827) * Allow only unpublish in schedule publish overlay if user has permission * Adjust logic to newer JS syntax * Fix update configuration * Delete updated property names * Style unpublish date as disabled * Fix css selector for new button element * Make buttons and datepickers more consistent in invariant and variant versions of schedule overlay * Fill half width like in invariant version of schedule overlay * Use native includes instead * return early from getPermissionsForContent Co-authored-by: Nathan Woulfe <[email protected]>
Co-authored-by: Zeegaan <[email protected]>
…2665) * Umbraco avatar component updated to fit the image * Fixed: Broken saved search dropdown in log viewer
# Conflicts: # src/Umbraco.Core/Actions/ActionAssignDomain.cs # src/Umbraco.Core/Actions/ActionCopy.cs # src/Umbraco.Core/Actions/ActionCreateBlueprintFromContent.cs # src/Umbraco.Core/Actions/ActionDelete.cs # src/Umbraco.Core/Actions/ActionMove.cs # src/Umbraco.Core/Actions/ActionNew.cs # src/Umbraco.Core/Actions/ActionNotify.cs # src/Umbraco.Core/Actions/ActionProtect.cs # src/Umbraco.Core/Actions/ActionRestore.cs # src/Umbraco.Core/Actions/ActionRights.cs # src/Umbraco.Core/Actions/ActionRollback.cs # src/Umbraco.Core/Actions/ActionSort.cs # src/Umbraco.Core/Actions/ActionToPublish.cs # src/Umbraco.Core/Actions/ActionUnpublish.cs # src/Umbraco.Core/Actions/ActionUpdate.cs # src/Umbraco.Core/Constants-Telemetry.cs # src/Umbraco.Core/DependencyInjection/ServiceCollectionExtensions.cs # src/Umbraco.Core/DependencyInjection/UmbracoBuilder.CollectionBuilders.cs # src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Collections.cs # src/Umbraco.Core/Models/Trees/ActionMenuItem.cs # src/Umbraco.Core/Models/Trees/CreateChildEntity.cs # src/Umbraco.Core/Models/Trees/ExportMember.cs # src/Umbraco.Core/Models/Trees/MenuItem.cs # src/Umbraco.Core/Models/Trees/RefreshNode.cs # src/Umbraco.Core/Persistence/Repositories/IRedirectUrlRepository.cs # src/Umbraco.Core/PropertyEditors/NestedContentConfiguration.cs # src/Umbraco.Core/Routing/ContentFinderByRedirectUrl.cs # src/Umbraco.Core/Services/IFileService.cs # src/Umbraco.Core/Services/IRedirectUrlService.cs # src/Umbraco.Core/Services/RedirectUrlService.cs # src/Umbraco.Core/Trees/MenuItemList.cs # src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MemberRepository.cs # src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RedirectUrlRepository.cs # src/Umbraco.Infrastructure/Telemetry/Providers/SystemInformationTelemetryProvider.cs # src/Umbraco.Web.BackOffice/Controllers/CodeFileController.cs # src/Umbraco.Web.BackOffice/Controllers/ContentController.cs # src/Umbraco.Web.BackOffice/Controllers/DictionaryController.cs # src/Umbraco.Web.BackOffice/Controllers/EntityController.cs # src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs # src/Umbraco.Web.BackOffice/Trees/ContentBlueprintTreeController.cs # src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs # src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs # src/Umbraco.Web.BackOffice/Trees/ContentTypeTreeController.cs # src/Umbraco.Web.BackOffice/Trees/DataTypeTreeController.cs # src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.cs # src/Umbraco.Web.BackOffice/Trees/FileSystemTreeController.cs # src/Umbraco.Web.BackOffice/Trees/MacrosTreeController.cs # src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs # src/Umbraco.Web.BackOffice/Trees/MediaTypeTreeController.cs # src/Umbraco.Web.BackOffice/Trees/MemberGroupTreeController.cs # src/Umbraco.Web.BackOffice/Trees/MemberTreeController.cs # src/Umbraco.Web.BackOffice/Trees/MemberTypeAndGroupTreeControllerBase.cs # src/Umbraco.Web.BackOffice/Trees/RelationTypeTreeController.cs # src/Umbraco.Web.BackOffice/Trees/TemplatesTreeController.cs # src/Umbraco.Web.UI.Client/src/less/navs.less # templates/UmbracoProject/.gitignore # tests/Umbraco.Tests.Integration/Umbraco.Core/Telemetry/TelemetryServiceTests.cs # tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/UserDataServiceTests.cs # tests/Umbraco.Tests.UnitTests/Umbraco.Core/Telemetry/SystemInformationTelemetryProviderTests.cs
* Revert incorrect change in Property.PublishValues Fix incorrect change made for nullability support which changes the result of the updated expression to `false` instead of `true` when both inputs are `null`. That is, `null?.InvariantEquals(null) ?? false` becomes `false` but in the previous version it was `true` since the `InvariantEquals` extension method simply calls `string.Equals(v1, v2)` which will return `true` when both inputs are `null`. Due to the `?` operator the `InvariantEquals` method is not called anymore and `?? false` turns the expression to `false`. * Update PropertyValidationService.cs Reverts incorrect update for nullability that changes a value of `true` into `false` when both operands are `null`. Co-authored-by: Nikolaj Geisle <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.