forked from dnnsoftware/Dnn.Platform
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/dnnsoftware/Dnn.Platform
- Loading branch information
Showing
544 changed files
with
1,720 additions
and
2,074 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,6 +9,7 @@ | |
*.suo | ||
*.user | ||
*.sln.docstates | ||
*.local.sln | ||
|
||
# Build results | ||
[Rr]elease | ||
|
108 changes: 56 additions & 52 deletions
108
DNN Platform/DotNetNuke.Web/InternalServices/ItemListServiceController.cs
Large diffs are not rendered by default.
Oops, something went wrong.
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
8 changes: 4 additions & 4 deletions
8
DNN Platform/Tests/DotNetNuke.Tests.Urls/TestFiles/FriendlyUrl/SpaceEncoding/Settings.csv
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
Key, Value | ||
UrlFormat, advanced | ||
FriendlyAdminHostUrls, true | ||
PageExtensionUsageType, AlwaysUse | ||
Key, Value, | ||
UrlFormat, advanced, | ||
FriendlyAdminHostUrls, true, | ||
PageExtensionUsageType, AlwaysUse, |
17 changes: 10 additions & 7 deletions
17
DNN Platform/Tests/DotNetNuke.Tests.Urls/TestFiles/FriendlyUrl/SpaceEncoding/TestFile.csv
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,10 @@ | ||
Test, Scheme, SpaceEncoding, Page Name, Params, Expected Url, | ||
Default 1QS, http://, , Home, &view=Show Code, http://{alias}/Home/view/Show%20Code.aspx | ||
Plus 1QS, http://, +, Home, &view=Show Code, http://{alias}/Home/view/Show+Code.aspx | ||
Unicode 1QS, http://, %20, Home, &view=Show Code, http://{alias}/Home/view/Show%20Code.aspx | ||
Default 2QS, http://, , Home, &ctl=Add Item&mid=100, http://{alias}/Home/ctl/Add%20Item/mid/100.aspx | ||
Plus 2QS, http://, +, Home, &ctl=Add Item&mid=100, http://{alias}/Home/ctl/Add+Item/mid/100.aspx | ||
Unicode 2QS, http://, %20, Home, &ctl=Add Item&mid=100, http://{alias}/Home/ctl/Add%20Item/mid/100.aspx | ||
Test, Scheme, SpaceEncoding, Page Name, Params, Expected Url, | ||
Default About Us, http://, , About Us, , http://{alias}/About%20Us.aspx | ||
Plus About Us, http://, +, About Us, , http://{alias}/About+Us.aspx | ||
Unicode About Us, http://, %20, About Us, , http://{alias}/About%20Us.aspx | ||
Default 1QS, http://, , Home, &view=Show Code, http://{alias}/Home/view/Show%20Code.aspx | ||
Plus 1QS, http://, +, Home, &view=Show Code, http://{alias}/Home/view/Show+Code.aspx | ||
Unicode 1QS, http://, %20, Home, &view=Show Code, http://{alias}/Home/view/Show%20Code.aspx | ||
Default 2QS, http://, , Home, &ctl=Add Item&mid=100, http://{alias}/Home/ctl/Add%20Item/mid/100.aspx | ||
Plus 2QS, http://, +, Home, &ctl=Add Item&mid=100, http://{alias}/Home/ctl/Add+Item/mid/100.aspx | ||
Unicode 2QS, http://, %20, Home, &ctl=Add Item&mid=100, http://{alias}/Home/ctl/Add%20Item/mid/100.aspx |
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
9 changes: 4 additions & 5 deletions
9
...ontent Localization/Choosing Translations/01 Creating Localized Pages for a Language.html
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
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
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
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
Oops, something went wrong.