-
Notifications
You must be signed in to change notification settings - Fork 754
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
valadas
merged 65 commits into
dnnsoftware:feature/resource-manager
from
donker:mergedev
Aug 23, 2020
Merged
Meged latest changes from development into the resource manager feature branch #4006
valadas
merged 65 commits into
dnnsoftware:feature/resource-manager
from
donker:mergedev
Aug 23, 2020
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
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
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
Reset invalidation link on email change
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>
… to populate the page picker properly PR dnnsoftware#3996
…tatus-on-hold Update mergeable to check for Status: On Hold label
Standardize on CR/LF line endings
valadas
changed the title
Mergedev
Meged latest changes from development into the resource manager feature branch
Aug 23, 2020
valadas
approved these changes
Aug 23, 2020
There was a problem hiding this 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.
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.
Merging latest changes into this feature branch