Skip to content

Forward merge v11/dev to v12/dev#13509

Merged
nikolajlauridsen merged 22 commits intov12/devfrom
v12/fix/merge-with-v11-dev-take-2
Dec 1, 2022
Merged

Forward merge v11/dev to v12/dev#13509
nikolajlauridsen merged 22 commits intov12/devfrom
v12/fix/merge-with-v11-dev-take-2

Conversation

@kjac
Copy link
Copy Markdown
Contributor

@kjac kjac commented Dec 1, 2022

Make sure v12/dev is in sync with v11/dev

iOvergaard and others added 22 commits November 28, 2022 11:15
* 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>
* 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
Copy link
Copy Markdown
Contributor

@nikolajlauridsen nikolajlauridsen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@nikolajlauridsen nikolajlauridsen merged commit 0b95d5e into v12/dev Dec 1, 2022
@nikolajlauridsen nikolajlauridsen deleted the v12/fix/merge-with-v11-dev-take-2 branch December 1, 2022 11:50
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.

8 participants