Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase feature/resource-manager with latest changes on develop #4134

Merged
Merged
Changes from 1 commit
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
f1f291d
Fix for issue Newly created sub-folder not shown if the parent folder…
kmuralidaran Aug 12, 2020
e951a64
module friendly name updated as part of module extension update
tauqeer-haider Sep 11, 2020
0c13eed
review suggestions incorporated
tauqeer-haider Sep 13, 2020
9b7df8f
send email to user from host or portal admin email
thabaum Sep 15, 2020
d664bd3
Update test SMTP logic to match host controller
thabaum Sep 15, 2020
d87195a
Update ServerSettingsSmtpAdminController.cs
thabaum Sep 15, 2020
50ef71b
Update ServerSettingsSmtpHostController.cs
thabaum Sep 15, 2020
392f2e2
Update ServerSettingsSmtpHostController.cs
thabaum Sep 15, 2020
935035e
Update ServerSettingsSmtpHostController.cs
thabaum Sep 16, 2020
016b3eb
Update ServerSettingsSmtpAdminController.cs
thabaum Sep 16, 2020
c3945c5
Update ServerSettingsSmtpHostController.cs
thabaum Sep 16, 2020
f4b08bf
Replace momentjs with dayjs for Servers.Web (#4104)
david-poindexter Sep 20, 2020
5f59533
Fixed an issue where the React common components would interfere with…
valadas Sep 20, 2020
a92a7fc
Replace momentjs with dayjs in Users.Web
david-poindexter Sep 20, 2020
fb65618
Merge pull request #4108 from david-poindexter/issue-3875
mitchelsellers Sep 20, 2020
0db1cd2
Merge pull request #4109 from valadas/issue4107
mitchelsellers Sep 21, 2020
9f980af
Removed old Telerik Code that was commented out
mitchelsellers Sep 21, 2020
d7c6afa
Updated to add proper reference to Telerik being removed in 10.0.0
mitchelsellers Sep 21, 2020
924349b
Updated Telerik Specifc implementation of control skins to a more acc…
mitchelsellers Sep 21, 2020
a3730a0
Removed empty folder from solution
mitchelsellers Sep 21, 2020
49d88e4
Added note to missing control
mitchelsellers Sep 21, 2020
e9abb9e
Adjusts build scripts to build CKEditor (#4105)
valadas Sep 21, 2020
5996ecc
Removal of references to the Dashboard Project Type (#4117)
mitchelsellers Sep 22, 2020
656cd70
Fix module dialog adding new module to wrong pane (#4113)
bdukes Sep 22, 2020
95e8bdb
DNN Platform Documentation Fixes (#4115)
mitchelsellers Sep 22, 2020
b6a0079
Treat warnings as errors for DotNetNuke.Instrumentation
bdukes Sep 22, 2020
75cf812
Removed unused usings to standardize before cleanup
mitchelsellers Sep 22, 2020
5292562
Removed 3.x/4.x migraton warning from installer for Memebrship Change…
mitchelsellers Sep 22, 2020
0b9e83e
Removed .NET 3.5 and .NET 4.0 upgrade steps since these are requireme…
mitchelsellers Sep 22, 2020
98e324c
Removed 3.2.3 Upgrade steps
mitchelsellers Sep 22, 2020
4c9612f
Remove 4.4.0 Upgrade Steps
mitchelsellers Sep 22, 2020
fdb5abb
Remove 4.7.0 Upgrade Steps
mitchelsellers Sep 22, 2020
7a3fd76
Remove 4.8.0 Upgrade Steps
mitchelsellers Sep 22, 2020
f122f43
Removed 5.0.0 Upgrade Steps
mitchelsellers Sep 22, 2020
e9ea74a
Removed 5.1.x upgrade steps
mitchelsellers Sep 22, 2020
131b29c
Removed 5.2.x upgrades
mitchelsellers Sep 22, 2020
3dbf347
Removed 5.3 and 5.4 Upgrades
mitchelsellers Sep 22, 2020
50c26e8
Removed 5.5 and 5.6 upgrades
mitchelsellers Sep 22, 2020
6a847ae
Removed 6.0 - 6.1 Upgrades
mitchelsellers Sep 22, 2020
b657d0f
Removaed remainder of 6.x upgrade steps and unused code
mitchelsellers Sep 22, 2020
930c29c
Removed all upgrade steps through 7.4.2
mitchelsellers Sep 22, 2020
4d63f2b
Removal of private items not used, and addition of notice for public …
mitchelsellers Sep 22, 2020
05a8b75
Removed Config Merge files no longer needed
mitchelsellers Sep 22, 2020
6afe029
Removed comment
mitchelsellers Sep 23, 2020
f086bc3
Remove the Improvement Program (#4121)
mitchelsellers Sep 23, 2020
fc690fd
Merge pull request #4082 from tauqeer-haider/bugfix/DNN-43710
mitchelsellers Sep 24, 2020
224cabd
Error message to use correct error icon
tauqeer-haider Sep 24, 2020
1c82b05
Merge pull request #4124 from tauqeer-haider/bugfix/DNN-43971
mitchelsellers Sep 24, 2020
20ea0d3
Purge Expired JWT tokens task (#4126)
donker Sep 24, 2020
6afbd16
Update mergeable to not allow merging of PRs with Future:... milestone
david-poindexter Sep 25, 2020
1639966
Merge pull request #4127 from david-poindexter/mergeable-milestone
valadas Sep 25, 2020
6f883ba
Merge pull request #4122 from bdukes/instrumentation-warnings
mitchelsellers Sep 25, 2020
2c82c13
Update Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/ServerS…
thabaum Sep 25, 2020
7cda0ae
Merge pull request #4089 from thabaum/patch-29
mitchelsellers Sep 26, 2020
d8e1906
Address React invariant violation (#4129)
bdukes Sep 27, 2020
9ebc627
Merge pull request #3976 from kmuralidaran/bugfix/DNN-40416
valadas Sep 27, 2020
ca77a74
Merge branch 'develop' into feature/resource-manager
valadas Sep 27, 2020
6e34751
Fixed a wrong merge resolution in solution file
valadas Sep 27, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix for issue Newly created sub-folder not shown if the parent folder…
… name starts with "0"
  • Loading branch information
kmuralidaran committed Aug 12, 2020
commit f1f291d70ffe6b86bf67248c73e73bccde865b70
4 changes: 2 additions & 2 deletions DNN Platform/Library/Common/Utilities/PathUtils.cs
Original file line number Diff line number Diff line change
@@ -222,7 +222,7 @@ public virtual string RemoveTrailingSlash(string source)
}

/// <summary>
/// Strips the original path by removing starting 0 or 0\\.
/// Strips the original path by removing starting 0\\.
/// </summary>
/// <param name="originalPath">The original path.</param>
/// <returns>The stripped path.</returns>
@@ -235,7 +235,7 @@ public virtual string StripFolderPath(string originalPath)
return FolderPathRx.Replace(originalPath, string.Empty);
}

return originalPath.StartsWith("0") ? originalPath.Substring(1) : originalPath;
return originalPath;
}

internal string GetUserFolderPathElementInternal(int userId, UserFolderElement mode)