Forward merge v11/dev to v12/dev#13509
Merged
nikolajlauridsen merged 22 commits intov12/devfrom Dec 1, 2022
Merged
Conversation
* Added various translations * Added another translation * Change request
…3489) * Remove breaking changes in Deploy connector interfaces * Add extension methods for calling the new interface methods in a backwards-compatible way
* Allow changing logging directory from configuration * Clean up * Missing return statement * Apply suggestions from code review Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> * Update src/Umbraco.Core/Constants-SystemDirectories.cs Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>
# Conflicts: # version.json
* Make sure contexbar fits within the available space * Ensuring context bar moves above, no matter size of it. * Fixing apperance of connection-fixers
* load relations immediately on init and remove call to non-existing function `appTabChange` on destroy * load relations immediately on init and remove now not-used eventsService
* Updated nuget packages * Remove npoco update Co-authored-by: nikolajlauridsen <nikolajlauridsen@protonmail.ch>
* Updated nuget packages * Remove npoco update Co-authored-by: nikolajlauridsen <nikolajlauridsen@protonmail.ch>
# Conflicts: # version.json
* V10/feature/fixing flaky acceptance test (#13473) * Bumped version
This file contains hidden or 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
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.
Make sure v12/dev is in sync with v11/dev