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

Meged latest changes from development into the resource manager feature branch #4006

Merged
merged 65 commits into from
Aug 23, 2020

Conversation

donker
Copy link
Contributor

@donker donker commented Aug 23, 2020

Merging latest changes into this feature branch

ajwaka and others added 30 commits July 9, 2020 12:07
Updated usage in TabIndexer.cs
Used same logic for check in CoreSitemapProvider.cs
Resolves dnnsoftware#3893

Co-authored-by: Daniel Valadas <info@danielvaladas.com>
Co-authored-by: Brian Dukes <bdukes@engagesoftware.com>
Co-authored-by: Brian Dukes <bdukes@engagesoftware.com>
Co-authored-by: Brian Dukes <bdukes@engagesoftware.com>
Co-authored-by: Brian Dukes <bdukes@engagesoftware.com>
Co-authored-by: Brian Dukes <bdukes@engagesoftware.com>
Co-authored-by: Brian Dukes <bdukes@engagesoftware.com>
Fixes stylecop warnings on FolderManager.cs
Enable Scheduling - Add TZ to page StartDate and EndDate
)

* Exception data is updated and client is updated to show exception
message
* Unit Tests
* Stylecop changes
These restrict the ability to manage NuGet upgrades using the tools
within Visual Studio.  There may have been some tooling that DNN Corp
used at one time to keep projects in sync, but it's no longer in place,
as far as I know.
These weren't even referenced by the project.s
Version 5.1.3 of the Microsoft.AspNet.Mvc NuGet packages, which we've
been depending on for a while, depends on Microsoft.AspNet.WebPages and
Microsoft.AspNet.Razor in the version range >= 3.1.2 && < 3.2.0 (which
only resolves to 3.1.2).
Modify Logo skin object to handle SVGs
Retry determining Globals.Status if it was Error
Ensure DI services are disposed in WebForms
mikebigun and others added 21 commits July 30, 2020 09:20
Merge fixes from release/9.7.0 to develop
Issue-3956 - Adding a page URL always defaults to 'Page and Child pages' site alias option.
Prevent Role Groups dropdown expand on delete
Added retry to CompressionUtil.OpenCreate to prevent failures during site export
Issue-3982 - URLs added to pages unexpectedly redirect to the original URL
…jection (dnnsoftware#3988)

* Created IApplicationInfo and IApplicationStatusInfo interfaces and marked related global apis as deprecated
* Adjusted global methods that needed to use new way of handling application status via IApplicationStatusInfo
* Added INotifyPropertyChanged to the LazyServiceProvider this allow Globals to listen for when the provider is set and update any dependencies in the Globals class
* Updated global to immediately resolve dependencies if it doesn't implement INotifyPropertyChanged (useful for unit testing). Updated unit tests to mock out IApplicationStatusInfo
* Updated navigation manager to follow same pattern as ApplicationStatusInfo and resolve it only once

Co-authored-by: Brian Dukes <bdukes@engagesoftware.com>
…tatus-on-hold

Update mergeable to check for Status: On Hold label
@donker donker added this to the Future: Minor milestone Aug 23, 2020
@valadas valadas changed the title Mergedev Meged latest changes from development into the resource manager feature branch Aug 23, 2020
Copy link
Contributor

@valadas valadas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, this is a release management task and we are self-approving it for that reason.

@valadas valadas merged commit dc1e4ee into dnnsoftware:feature/resource-manager Aug 23, 2020
@donker donker deleted the mergedev branch August 25, 2020 09:09
@valadas valadas modified the milestones: Future: Minor, 9.8.0 Oct 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.