V9: Merge v8: 03-11-2021 #11568
Merged
V9: Merge v8: 03-11-2021 #11568
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
…nstead of /umbraco
* adding validation * adding localization keys * applying cleaning up notes * fix spaces * revert ex.xml * spaces again * keep it DRY * chenge hasTabsAndFirstRender to hasTabsOrFirstRender Co-authored-by: inada <[email protected]>
* Add last Updated text under general * Map missing fallback text values and refactor <i> to <umb-icon> directive * fix icon styling
* adding unit test for validating language xml files. * locating the language files by traversing instead of hardcoded path. * debugging null refs. * debugging * Updated method of detecting language folder for XML tests, that should work correctly on the build server. * Path amends to support running test on build server. * Path amends to support running test on build server (2). Co-authored-by: Andy Butland <[email protected]>
…_03-11-2021 # Conflicts: # src/Umbraco.Core/Configuration/GlobalSettings.cs # src/Umbraco.Core/Configuration/IGlobalSettings.cs # src/Umbraco.Core/Constants-AppSettings.cs # src/Umbraco.Tests/Umbraco.Tests.csproj # src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs # src/Umbraco.Web.UI/umbraco/config/lang/en.xml # src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml # src/Umbraco.Web.UI/web.Template.config # src/Umbraco.Web/Editors/ContentTypeController.cs # src/Umbraco.Web/HealthCheck/Checks/Security/BaseHttpHeaderCheck.cs # tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configurations/LanguageXmlTests.cs
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.
Merged from v8 03-11-2021