Merge 9.4.x to development #3191
Merged
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
…tokenizedBuilkEmail
* Corrected references to older site URL * corrected typo from replacement of registered character
Co-Authored-By: Brian Dukes <bdukes@engagesoftware.com>
Co-Authored-By: Brian Dukes <bdukes@engagesoftware.com>
fs is a core package, and the version on the npm registry is just an empty package; this was almost certainly added accidentally Fixes dnnsoftware#3091
Simplifies local build command
* Updated de-DE text As per Sebastian Leupold translation * Updated nl-NL warning about .Net 4.7.2 As per Timo Breumelhof translation
SEO tip for creating a title (cherry picked from commit 04d1ee6)
Remove disposal of MemoryStream for email attachments sent using SendTokenizedBulkEmail
DNN-7818: add send verification mail link in unverified message.
(cherry picked from commit e77a281)
Fixes errors with previous build scripts following PB merge
* Updates documentation as per recent changes * Added version information * Removed unneeded BuildAll parameter * Added back how to clean * Was already clearer
…lidate RoleGroup Name. closes dnnsoftware#2927 (dnnsoftware#3170)
…e#3160) * Added INavigationManager and updated Globals to reference new INavigationManager * Updated CreateModule to use new INavigationManager * Deprecated NavigateURL for v11.0 * Updated viewsource to use INavigationManager * Migrated Globals.NavigateUrl to use INavigationManager * Updated persona bar controllers to use NavigateUrl * Refactored NavigateURL to use new INavigationManager * Refactored Globals.NavigateURL -> INavigationManager * Refactored more NavigationManager usages * Updated more references to Globals.NavigateURL to use INavigationManager * Cleaned up mistakes that happened in config files in csproj files. These changes were auto-generated by visual studio and shouldn't have been made * removed generated nodes from csproj * Fixed spacing in web.config * Updated old Globals.NavigateURL methods to use registered INavigationManager so everything will execute the same code path * Updated INavigationManager reference to be static readonly instead of an instance property * Aliased Constants to 'Dnn.PersonaBar.Libary.Constants' to handle ambiguity * Added DependencyInjection to website project and updated RazorHost and Export * Updated DotNetNuke.Website Globals.NavigateURL references to use the new INavigationManager * Added missing using statement * Fixing typo Co-Authored-By: Brian Dukes <bdukes@engagesoftware.com> * Removing whitespace Co-Authored-By: Brian Dukes <bdukes@engagesoftware.com> * Fix typo * Use GetRequiredService for INavigationManager Rather than waiting for a null reference later when it's used, there's never a scenario where this dependency is expected to be missing, so we want to indicate that it's expected and recieve an error right away if there's an issue * Added new DotNetNuke.Abstractions project for storing different common abstractions for the platform * Updated all (non website project) classes to use INavigationManager from the new DotNetNuke.Abstractions project * Updated Website Project to use the INavigationManager from the new DotNetNuke.Abstractions project * Removed unnecessary attributes from NavigationManager * Updated redirection controller tests to mock out the DependencyProvider and the INavigationManager to fix failing unit tests * Fixed failing unit tests with mocking out INavigationManager * Removed private fields for DependencyProvider * Added singleton clear statements to prevent the INavigationManager from remaining in memory and conflicts between unit tests * Reset singleton state for PortalController to reduce side-effects from other tests and stale object state from Dependency Injection * Moved state cleanup code to teardown routine * Fixed failing unit tests in tests.web project. Added mocks for INavigationManager so the DepenencyProvider can resolve * Added new DotNetNuke.Abstractions.nuspec to create NuGets during build * Added missing nuspec files to the solution file * Updated copyright on all nuget files * Added .NET Foundation file headers to new Abstraction files * Resolved duplicate addition of DotNetNuke.Abstractions to sln file * Added SetTestableInstance and Clear methods to make it easier to test Components. The new methods are internal * Added happy path test for Navigation Manager * Added NavigationManager tests * Updated all INavigationManager references in .ascx.cs files to use private readonly since there should never be a child class * Removed extra's added by visual studio to .csproj files
…e#3189)" This reverts commit 697a54e. Platform/DotNetNuke.Web.Mvc/Framework/ActionResults/DnnRedirecttoRouteResult.cs Platform/DotNetNuke.Website.Deprecated/DotNetNuke.Website.Deprecated.csproj Platform/DotNetNuke.Website.Deprecated/admin/ControlPanel/AddModule.ascx.cs Platform/DotNetNuke.Website.Deprecated/admin/ControlPanel/AddPage.ascx.cs Platform/DotNetNuke.Website.Deprecated/admin/ControlPanel/ControlBar.ascx.cs Platform/DotNetNuke.Website.Deprecated/admin/ControlPanel/UpdatePage.ascx.cs Platform/DotNetNuke.Website.Deprecated/admin/ControlPanel/WebUpload.ascx.cs Platform/Modules/MemberDirectory/DotNetNuke.Modules.MemberDirectory.csproj Platform/Tests/DotNetNuke.Tests.Core/Providers/Folder/StandardFolderProviderTests.cs Platform/Tests/DotNetNuke.Tests.Core/Services/Mobile/RedirectionControllerTests.cs Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/CreateModuleController.cs Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageInfoDto.cs Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/AuthSystemPackageEditor.cs Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/CoreLanguagePackageEditor.cs Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Editors/ExtensionLanguagePackageEditor.cs Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/ExtensionsController.cs Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Pages/Converters.cs Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/SiteSettings/SiteSettingsController.cs Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Dto/UserDetailDto.cs Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.csproj Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/ExtensionMenuController.cs Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/MenuControllers/ThemeMenuController.cs Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/LanguagesController.cs Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/PagesController.cs Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SeoController.cs Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/ServerController.cs Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SiteSettingsController.cs Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/packages.config Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Containers/PersonaBarContainer.cs Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Dnn.PersonaBar.Library.csproj Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/MenuControllers/LinkMenuController.cs
…ment # Conflicts: # .github/ISSUE_TEMPLATE/bug-report.md # DNN Platform/Admin Modules/Dnn.Modules.Console/ViewConsole.ascx.cs # DNN Platform/Admin Modules/Dnn.Modules.ModuleCreator/CreateModule.ascx.cs # DNN Platform/Admin Modules/Dnn.Modules.ModuleCreator/viewsource.ascx.cs # DNN Platform/DotNetNuke.Web.Razor/Helpers/UrlHelper.cs # DNN Platform/DotNetNuke.Web/Mvp/ProfileModuleViewBase.cs # DNN Platform/DotNetNuke.Web/UI/WebControls/DnnRibbonBarTool.cs # DNN Platform/DotNetNuke.Website.Deprecated/admin/ControlPanel/AddModule.ascx.cs # DNN Platform/DotNetNuke.Website.Deprecated/admin/ControlPanel/AddPage.ascx.cs # DNN Platform/DotNetNuke.Website.Deprecated/admin/ControlPanel/ControlBar.ascx.cs # DNN Platform/DotNetNuke.Website.Deprecated/admin/ControlPanel/UpdatePage.ascx.cs # DNN Platform/DotNetNuke.Website.Deprecated/admin/ControlPanel/WebUpload.ascx.cs # DNN Platform/Library/Common/Globals.cs # DNN Platform/Library/Common/Internal/GlobalsImpl.cs # DNN Platform/Library/Common/Lists/ListEntryCollection.cs # DNN Platform/Library/Common/Utilities/UrlUtils.cs # DNN Platform/Library/Entities/Content/Workflow/Obsolete/ContentWorkflow.cs # DNN Platform/Library/Entities/Content/Workflow/Obsolete/ContentWorkflowController.cs # DNN Platform/Library/Entities/Content/Workflow/Obsolete/ContentWorkflowLog.cs # DNN Platform/Library/Entities/Content/Workflow/Obsolete/ContentWorkflowLogType.cs # DNN Platform/Library/Entities/Content/Workflow/Obsolete/ContentWorkflowSource.cs # DNN Platform/Library/Entities/Content/Workflow/Obsolete/ContentWorkflowState.cs # DNN Platform/Library/Entities/Content/Workflow/Obsolete/ContentWorkflowStatePermission.cs # DNN Platform/Library/Entities/Content/Workflow/Obsolete/IContentWorkflowAction.cs # DNN Platform/Library/Entities/Content/Workflow/Obsolete/IContentWorkflowController.cs # DNN Platform/Library/Entities/Modules/ISearchable.cs # DNN Platform/Library/Obsolete/CBO.cs # DNN Platform/Library/Obsolete/IModuleController.cs # DNN Platform/Library/Obsolete/IPortalAliasController.cs # DNN Platform/Library/Obsolete/IPortalSettings.cs # DNN Platform/Library/Obsolete/IRoleController.cs # DNN Platform/Library/Obsolete/ITabController.cs # DNN Platform/Library/Obsolete/IUserController.cs # DNN Platform/Library/Obsolete/LogController.cs # DNN Platform/Library/Obsolete/ModuleController.cs # DNN Platform/Library/Obsolete/PortalAliasController.cs # DNN Platform/Library/Obsolete/PortalController.cs # DNN Platform/Library/Obsolete/PortalSettings.cs # DNN Platform/Library/Obsolete/PortalTemplateIOImpl.cs # DNN Platform/Library/Obsolete/RoleController.cs # DNN Platform/Library/Obsolete/TabController.cs # DNN Platform/Library/Obsolete/TestableModuleController.cs # DNN Platform/Library/Obsolete/TestablePortalAliasController.cs # DNN Platform/Library/Obsolete/TestablePortalController.cs # DNN Platform/Library/Obsolete/TestablePortalSettings.cs # DNN Platform/Library/Obsolete/TestableRoleController.cs # DNN Platform/Library/Obsolete/TestableTabController.cs # DNN Platform/Library/Obsolete/TestableUserController.cs # DNN Platform/Library/Obsolete/UserController.cs # DNN Platform/Library/Services/Search/SearchConfig.cs # DNN Platform/Library/Services/Search/SearchCriteria.cs # DNN Platform/Library/Services/Search/SearchCriteriaCollection.cs # DNN Platform/Library/Services/Search/SearchDataStore.cs # DNN Platform/Library/Services/Search/SearchDataStoreController.cs # DNN Platform/Library/Services/Search/SearchDataStoreProvider.cs # DNN Platform/Library/Services/Search/SearchItemInfo.cs # DNN Platform/Library/Services/Search/SearchItemInfoCollection.cs # DNN Platform/Library/Services/Search/SearchResultsInfo.cs # DNN Platform/Library/Services/Search/SearchResultsInfoCollection.cs # DNN Platform/Library/UI/Modules/ProfileModuleUserControlBase.cs # DNN Platform/Modules/DigitalAssets/EditFolderMapping.ascx.cs # DNN Platform/Modules/DigitalAssets/FolderMappings.ascx.cs # DNN Platform/Modules/DigitalAssets/View.ascx.cs # DNN Platform/Modules/Groups/GroupsModuleBase.cs # DNN Platform/Modules/Groups/View.ascx.cs # DNN Platform/Modules/HTML/Components/HtmlTextController.cs # DNN Platform/Modules/HTML/EditHtml.ascx.cs # DNN Platform/Modules/HTML/HtmlModule.ascx.cs # DNN Platform/Modules/HTML/MyWork.ascx.cs # DNN Platform/Modules/RazorHost/AddScript.ascx.cs # DNN Platform/Modules/RazorHost/CreateModule.ascx.cs # DNN Platform/Modules/RazorHost/EditScript.ascx.cs # Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageInfoDto.cs # Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/ExtensionsController.cs # Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Users/Dto/UserDetailDto.cs # Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Containers/PersonaBarContainer.cs # Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/MenuControllers/LinkMenuController.cs # Website/Default.aspx.cs # Website/DesktopModules/Admin/Authentication/Login.ascx.cs # Website/DesktopModules/Admin/EditExtension/AuthenticationEditor.ascx.cs # Website/DesktopModules/Admin/EditExtension/EditExtension.ascx.cs # Website/DesktopModules/Admin/Security/EditUser.ascx.cs # Website/DesktopModules/Admin/Security/ManageUsers.ascx.cs # Website/DesktopModules/Admin/Security/Membership.ascx.cs # Website/DesktopModules/Admin/Security/ProfileDefinitions.ascx.cs # Website/DesktopModules/Admin/Security/Register.ascx.cs # Website/DesktopModules/Admin/Security/SecurityRoles.ascx.cs # Website/DesktopModules/Admin/ViewProfile/ViewProfile.ascx.cs # Website/DesktopModules/AuthenticationServices/DNN/Login.ascx.cs # Website/admin/Modules/Export.ascx.cs # Website/admin/Modules/Import.ascx.cs # Website/admin/Modules/ModulePermissions.ascx.cs # Website/admin/Modules/Modulesettings.ascx.cs # Website/admin/Modules/viewsource.ascx.cs # Website/admin/Sales/Purchase.ascx.cs # Website/admin/Security/PasswordReset.ascx.cs # Website/admin/Security/SendPassword.ascx.cs # Website/admin/Skins/BreadCrumb.ascx.cs # Website/admin/Skins/LeftMenu.ascx.cs # Website/admin/Skins/Login.ascx.cs # Website/admin/Skins/Logo.ascx.cs # Website/admin/Skins/Privacy.ascx.cs # Website/admin/Skins/Search.ascx.cs # Website/admin/Skins/Terms.ascx.cs # Website/admin/Skins/User.ascx.cs # Website/admin/Skins/UserAndLogin.ascx.cs # Website/admin/Skins/tags.ascx.cs # Website/admin/Tabs/Export.ascx.cs # Website/admin/Tabs/Import.ascx.cs
|
My Bad! |
mitchelsellers
approved these changes
Oct 22, 2019
|
@bdukes You ok with me "Merge Committing" this as an admin function to fix this |
|
yup! thanks, @mitchelsellers |
|
Do I need to do something or is this good to go now? |
valadas
approved these changes
Oct 23, 2019
|
@bdukes in general we should not use "Squash and merge", only if the commits are really too granular for a single thing we would use that right? |
|
In general, squash or rebase are both fine (and, yes, the difference between them would be how important the individual commits are). But when we're copying commits from one long-lived branch to another long-lived branch, that's when a merge commit is important. |
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.
@mitchelsellers used a squash on #3189, but we need a merge commit to connect the commits into both branches. This PR includes a merge commit (and still needs to be approved/integrated via merging), and also happens to fix a merge conflict we missed in
.github/ISSUE_TEMPLATE/bug-report.md