Ibn labs/additional module directories dev 4 #5973
Closed
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
(cherry picked from commit 98e3592)
…abs/additional-module-directories
…alculate VirtualPath
rename AppLocations to ExtensionLocations remove ../ local path
Conflicts: src/Orchard/Orchard.Framework.csproj
Conflicts: src/Orchard/Orchard.Framework.csproj
Conflicts: src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.cshtml
[Fixes OrchardCMS#5912] Improve warning css in multi-tenant edit
…dditional-module-directories-dev-4 Conflicts: src/Orchard.Web/Web.config
| @@ -22,7 +21,9 @@ public class Compare : ValidationRule { | |||
| } | |||
|
|
|||
| private LocalizedString GetValidationMessage(ValidationContext context) { | |||
| return new LocalizedString(Tokenize(T(ErrorMessage.WithDefault(String.Format("{0} must match the value of {1}.", context.FieldName, TargetName))).ToString(), context)); | |||
| return String.IsNullOrWhiteSpace(ErrorMessage) | |||
There was a problem hiding this comment.
This has nothing to do with the PR
|
Could you try to squash your changes in a single commit, and "force push" to the same branch you are currently working on? This PR will be updated automatically. If you don't know how to do, just ping me on skype or gitter. |
|
#5982 is a squashed variant relative to 1.9.x . |
|
Almost ! |
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.
A variant of PR 5604 - against dev