Rebases 9.11.0 branch with latest changes on develop #5202
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
Use home page permissions as default when creating a top level page Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/PagesControllerImpl.cs Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.csproj
Undid some changes no longer needed Added SQL for PortalPermission Table and related SPs Platform/Website/Providers/DataProviders/SqlDataProvider/09.11.00.SqlDataProvider Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/PagesControllerImpl.cs Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/PagesController.cs
Upgrade caniuse-lite from 1.0.30001249 to 1.0.30001339
Added PortalPermission Controller class Added PortalPermission Info class Added PortalPermission Collection class Expanded PortalPermission Table Added vw_PortalPermission View Added SPs for PortalPermission Added data providers for PortalPermission Added PortalPermission to PortalInfo Added Helper functions for PortalPermission Added caching for PortalPermission Fixed spelling errors Platform/Website/Providers/DataProviders/SqlDataProvider/09.11.00.SqlDataProvider Platform/Website/Providers/DataProviders/SqlDataProvider/UnInstall.SqlDataProvider
AEModule.build had 2 globs that would return some of the same files and have them duplicated in resources.zip files, which was not a major issue but found it while troubleshooting another issue. Also, WebFormsMVP had recently been made into a package but it was not added to the list of unversioned manifest and would get automatically versioned by the current DNN version upon build.
Added PortalPermission checks to PermissionProvider Changed Permission Codes Use Home page permissions as default when adding top level pages New tabs created in GetTabById now set PortalId to current portal Platform/Website/Providers/DataProviders/SqlDataProvider/09.11.00.SqlDataProvider Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/PagesControllerImpl.cs Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Security/SecurityService.cs Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/PagesMenuController.cs
Bumps [superagent](https://github.com/visionmedia/superagent) from 6.1.0 to 7.1.6. - [Release notes](https://github.com/visionmedia/superagent/releases) - [Changelog](https://github.com/visionmedia/superagent/blob/master/HISTORY.md) - [Commits](ladjs/superagent@v6.1.0...v7.1.6) --- updated-dependencies: - dependency-name: superagent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [Fare](https://github.com/moodmosaic/Fare) from 2.1.2 to 2.2.0. - [Release notes](https://github.com/moodmosaic/Fare/releases) - [Commits](moodmosaic/Fare@v2.1.2...v2.2.0) --- updated-dependencies: - dependency-name: Fare dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bump Fare from 2.1.2 to 2.2.0
Bumps [System.Management.Automation](https://github.com/PowerShell/PowerShell) from 6.1.7601.17515 to 7.2.4. - [Release notes](https://github.com/PowerShell/PowerShell/releases) - [Commits](https://github.com/PowerShell/PowerShell/commits/v7.2.4) --- updated-dependencies: - dependency-name: System.Management.Automation dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
…agement.Automation-7.2.4 Bump System.Management.Automation from 6.1.7601.17515 to 7.2.4
…eragent-7.1.6 Bump superagent from 6.1.0 to 7.1.6
Removing some unnecessary values from SMTP entity
Improve server screen UI
Upgrade Cake.Frosting from 2.0.0 to 2.2.0
…ferrer uri with the request.
Update a couple of test dependencies
Platform/Tests/DNN.Integration.Test.Framework/DNN.Integration.Test.Framework.csproj Platform/Tests/DotNetNuke.Tests.AspNetCCP/DotNetNuke.Tests.AspNetCCP.csproj Platform/Tests/DotNetNuke.Tests.Authentication/DotNetNuke.Tests.Authentication.csproj Platform/Tests/DotNetNuke.Tests.Integration/DotNetNuke.Tests.Integration.csproj Platform/Tests/DotNetNuke.Tests.Utilities/DotNetNuke.Tests.Utilities.csproj Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/Dnn.PersonaBar.ConfigConsole.Tests.csproj Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/packages.config Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/Dnn.PersonaBar.Pages.Tests.csproj Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/Dnn.PersonaBar.Security.Tests.csproj Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/Dnn.PersonaBar.Users.Tests.csproj
Fix bug - postback issue with the cke editor
Upgrade NUnit to 3.13.3 and Test Adapter to 4.2.1
Bumps [react-collapse](https://github.com/nkbt/react-collapse) from 4.0.3 to 5.1.0. - [Release notes](https://github.com/nkbt/react-collapse/releases) - [Commits](nkbt/react-collapse@v4.0.3...v5.1.0) --- updated-dependencies: - dependency-name: react-collapse dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
* Add DotNetNuke.Tests.Modules project * Resolve error with malformed URLs in HTML module * Refactor and clean-up ManageRelativePaths Create overload without unused parameter Give variables more meaningful names Use StringComparison everywhere possible
* upgrade log4net to 2.0.14. * Update DNN Platform/DotNetNuke.Log4net/log4net/AssemblyInfo.cs Good idea Co-authored-by: Brian Dukes <bdukes@engagesoftware.com> Co-authored-by: Peter Donker <peter@bring2mind.net> Co-authored-by: Brian Dukes <bdukes@engagesoftware.com>
Top level pages
This will allow us to rerun a build without getting an error that the artifact was already published
Bumps [Portable.BouncyCastle](https://github.com/novotnyllc/bc-csharp) from 1.8.10 to 1.9.0. - [Release notes](https://github.com/novotnyllc/bc-csharp/releases) - [Commits](novotnyllc/bc-csharp@pcl-v1.8.10...pcl-v1.9.0) --- updated-dependencies: - dependency-name: Portable.BouncyCastle dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Platform/Connectors/GoogleTagManager/Dnn.GoogleTagManagerConnector.csproj Platform/DotNetNuke.Website.Deprecated/DotNetNuke.Website.Deprecated.csproj Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/DotNetNuke.Authentication.Facebook.csproj Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/web.Debug.config Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/web.Release.config Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/web.config Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/DotNetNuke.Authentication.Google.csproj Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/web.Debug.config Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/web.Release.config Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/web.config Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/DotNetNuke.Authentication.LiveConnect.csproj Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/web.Debug.config Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/web.Release.config Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/web.config Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/DotNetNuke.Authentication.Twitter.csproj Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/web.Debug.config Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/web.Release.config Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/web.config Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider.csproj Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/app.config Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/DotNetNuke.Providers.AspNetCCP.csproj Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/app.config Platform/Tests/DNN.Integration.Test.Framework/DNN.Integration.Test.Framework.csproj Platform/Tests/DotNetNuke.Tests.Authentication/DotNetNuke.Tests.Authentication.csproj Platform/Tests/DotNetNuke.Tests.Utilities/DotNetNuke.Tests.Utilities.csproj Dnn.AdminExperience/EditBar/Dnn.EditBar.Library/Dnn.EditBar.Library.csproj
Bumps [Yarn.MSBuild](https://github.com/natemcmaster/Yarn.MSBuild) from 1.22.10 to 1.22.17. - [Release notes](https://github.com/natemcmaster/Yarn.MSBuild/releases) - [Changelog](https://github.com/natemcmaster/Yarn.MSBuild/blob/main/releasenotes.props) - [Commits](natemcmaster/Yarn.MSBuild@v1.22.10...v1.22.17) --- updated-dependencies: - dependency-name: Yarn.MSBuild dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [jest](https://github.com/facebook/jest/tree/HEAD/packages/jest) from 24.8.0 to 28.1.2. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/commits/v28.1.2/packages/jest) --- updated-dependencies: - dependency-name: jest dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Add unique suffix to artifact name
…ld-1.22.17 Bump Yarn.MSBuild from 1.22.10 to 1.22.17
|
#5193 includes most of these changes, which should resolve the worst of the merge conflicts |
Oh, ok, let me start with that first then... |
…t-28.1.2 Bump jest from 24.8.0 to 28.1.2
Move OutputCacheAddItem change into correct script
This reverts commit 7a34b6f, reversing changes made to 327b1f5. Platform/Website/Providers/DataProviders/SqlDataProvider/09.11.00.SqlDataProvider Platform/Website/Providers/DataProviders/SqlDataProvider/UnInstall.SqlDataProvider Dnn.AdminExperience/ClientSide/Pages.Web/src/services/securityService.js Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/PagesControllerImpl.cs Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Pages/Security/SecurityService.cs Dnn.AdminExperience/Dnn.PersonaBar.Extensions/MenuControllers/PagesMenuController.cs Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/PagesController.cs
Revert "Merge pull request #5118 from DanielBolef/top-level-pages"
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.
Rebases 9.11.0 branch with latest changes on develop
We have some automation with this that are flaky so let's do a manual one here to resolve some potential conflicts...