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

Merging into master to release v9.8.1 #4400

Merged
merged 212 commits into from
Jan 6, 2021
Merged
Changes from 1 commit
Commits
Show all changes
212 commits
Select commit Hold shift + click to select a range
32a1feb
Update bug-report.md
valadas Oct 14, 2020
d90d5e5
Merge pull request #4193 from valadas/bump-issue-template-980
valadas Oct 14, 2020
57ee39b
Resolves multiple stylcop warnings in Library and HttpModules projects
valadas Oct 15, 2020
2e7e098
child page without a parent should not be validated
tauqeer-haider Oct 15, 2020
ce8914b
UnObsoleted IsHostMenu
valadas Oct 15, 2020
fcc434a
Deprecated PortalSettings in WebControlBase
valadas Oct 15, 2020
e5a738e
Deprecated PortalSettings in WebControlBase
valadas Oct 15, 2020
c6074ed
Disables waring on usage of GetCurrentPortalSettings
valadas Oct 15, 2020
a22c1ef
Fix tooltip Sitemap page priority
engineering87 Oct 15, 2020
e5f9408
Cleaned up UserProfileClass
valadas Oct 15, 2020
775d888
Deprecated CheckAuditLevel that takes PortalSettings in favour of new…
valadas Oct 15, 2020
04a4789
Update DNN Platform/Library/Services/Tokens/PropertyAccess/IPropertyA…
valadas Oct 15, 2020
f649a98
Update DNN Platform/Library/Services/Tokens/PropertyAccess/IPropertyA…
valadas Oct 15, 2020
eb9059e
Adjusted deprecation comments as suggested
valadas Oct 15, 2020
b28e2de
Reset redirect url for redirecting to 'Redirect After Login' page
kmuralidaran Oct 11, 2020
a450d58
#3661 - Addressed review comments
kmuralidaran Oct 13, 2020
22ad952
Revert "Merge branch 'bugfix/DNN-44083' of https://github.com/kmurali…
kmuralidaran Oct 13, 2020
101a13d
Addressed review comments
kmuralidaran Oct 13, 2020
2ff69fb
GetLoginPath() updated to return LocalPath
kmuralidaran Oct 14, 2020
66b5eda
Updated parameter with LoginTabId instead of TabName
kmuralidaran Oct 15, 2020
12bfd6d
Fixed an issue where the autocomplete on the country/region field wou…
joshgk00 Oct 14, 2020
f5660d9
Fixed whitespace for consistency
valadas Oct 14, 2020
3b80920
Resolved merge conflicts
valadas Oct 16, 2020
77a5507
Merge pull request #4198 from engineering87/develop
valadas Oct 16, 2020
a0793aa
Merge pull request #4194 from valadas/stylecop-20201015
mitchelsellers Oct 16, 2020
1df3a50
copied from GoogleAnalytics Connector
skamphuis Oct 16, 2020
4291750
added components from DNN.Services.Analytics
skamphuis Oct 16, 2020
873adf9
Fixes all warnings in the Console module
valadas Oct 16, 2020
27f0808
Removed an unused private variable that was missed
valadas Oct 16, 2020
621ba3a
Update DNN Platform/Admin Modules/Dnn.Modules.Console/Components/Busi…
bdukes Oct 16, 2020
94107fb
Remove impractical rule
david-poindexter Oct 18, 2020
a37c4f8
Resolves 1793 build warnings in Library project (#4204)
valadas Oct 18, 2020
4e657a8
Merge pull request #4210 from dnnsoftware/david-poindexter-patch-1
valadas Oct 18, 2020
76369ba
avoid I/O process frequency during export process.
zyhfish Oct 19, 2020
a9d2dd7
Ensure comments are only inserted when necessary
rhaiamz Oct 19, 2020
ad2176a
Issue-4222 - MembershipModule CurrentCulture fix
berkarslan-xo Oct 19, 2020
6e31101
Resolves some build warnings in DDRMenu Project
valadas Oct 19, 2020
b914c41
Merge pull request #4218 from zyhfish/bug/issue-4217
valadas Oct 19, 2020
b9f2791
Merge pull request #4223 from berkarslan-xo/bugfix/Issue-4222
valadas Oct 19, 2020
676db99
Updated .NET Framework requirement in InstallWizard localization file…
joshgk00 Oct 19, 2020
4afcc81
Merge pull request #4226 from joshgk00/Issue3791
valadas Oct 19, 2020
37c119a
Moved UserMode from PortalSettings to Personalization class (#4225)
valadas Oct 20, 2020
6701540
Removed finalizer
valadas Oct 20, 2020
5672f5e
Merge remote-tracking branch 'upstream/develop' into stylecop-ddr-menu
valadas Oct 20, 2020
c38d893
Prevent breaking change of Controller public Regex
valadas Oct 20, 2020
f7efa84
Fixed wrong version in deprecation message
valadas Oct 20, 2020
94a099f
Prevent breaking change on public internal PortalSettings
valadas Oct 20, 2020
6af2a81
Addresses concern with disposing page
valadas Oct 20, 2020
45da40c
Addresses concern with PortalSettings cast
valadas Oct 20, 2020
0d52a9f
Moves things deprecated in v9 to be removed in v11 instead of v10
valadas Oct 20, 2020
34a5a55
Corrected one that was done by mistake, it was declared in v6
valadas Oct 20, 2020
e790b39
Addresses breaking change danger on m_supportsIcons
valadas Oct 21, 2020
51bd38e
Merge remote-tracking branch 'upstream/develop' into stylecop-ddr-menu
valadas Oct 21, 2020
4594075
Resolved merge conflicts
valadas Oct 21, 2020
70d2db1
Resolves 101 build warnings on CoreMessaging project (#4216)
valadas Oct 22, 2020
6022cf9
Resolved all build warnings in RazorHost project (#4231)
valadas Oct 22, 2020
2963a94
Resolves some build warnings in the ImportExport project. (#4211)
valadas Oct 22, 2020
49b7291
Resolved all build warnings in Google Analytics Connector (#4209)
valadas Oct 22, 2020
6e7228e
Resolved 249 build warnings in Library project (#4215)
valadas Oct 22, 2020
6a48bd5
Typo fixes
bdukes Oct 22, 2020
cfd90c4
basically working
skamphuis Oct 22, 2020
2e48b6b
Merge pull request #4224 from valadas/stylecop-ddr-menu
valadas Oct 22, 2020
6fba719
Resolves some more build warnings on library project (#4236)
valadas Oct 22, 2020
62a72b6
Added the page ID to the admin ui page management experience
Oct 23, 2020
8f65ab7
Removed Module Creator from distribution
valadas Oct 18, 2020
febf141
Merge pull request #4240 from kieran23101/develop
valadas Oct 23, 2020
e2c583c
Deprecates IEventLogController in favor of DI
valadas Oct 26, 2020
9bced20
Merge pull request #4244 from valadas/deprecate-IEventLogController
valadas Oct 26, 2020
71295ca
Relaxed compile warnings on Tests projects
valadas Oct 26, 2020
e912475
config sample
skamphuis Oct 27, 2020
d835930
package
skamphuis Oct 27, 2020
58674b7
Merge branch 'develop' into feature/add-google-tagmanager-connector
skamphuis Oct 27, 2020
a5f83f8
Removed most warnings
skamphuis Oct 27, 2020
e5fb26c
SCAYT language code configuration fixed
tauqeer-haider Oct 27, 2020
9c8bdb0
Merge pull request #4245 from valadas/relax-stylecop-on-tests
mitchelsellers Oct 27, 2020
2be2b5e
Fix DevOps build badge
bdukes Oct 27, 2020
23fce15
Merge remote-tracking branch 'upstream/develop' into merge-980-deve
valadas Oct 28, 2020
b2db9a5
Merge pull request #4253 from valadas/merge-980-deve
valadas Oct 28, 2020
5d3b8fa
removed installer for PR
skamphuis Oct 28, 2020
9bdd85b
Applied suggested changes by @valadas
skamphuis Oct 28, 2020
726e76d
Fix data reader not getting disposed
bdukes Oct 28, 2020
0a6d239
Remove deprecation for some DataProvider methods
bdukes Oct 28, 2020
2561096
Update DNN Platform/Connectors/GoogleTagManager/GoogleTagManager.config
david-poindexter Oct 31, 2020
c02b48a
Merge pull request #4255 from skamphuis/feature/add-google-tagmanager…
valadas Nov 1, 2020
212d916
do not cache output if page is redirected
tauqeer-haider Nov 5, 2020
bed92b2
review suggestions incorporated.
tauqeer-haider Nov 5, 2020
27d11a9
Apply suggestions from code review
bdukes Nov 5, 2020
b6e4e91
Update DNN Platform/HttpModules/OutputCaching/OutputCacheModule.cs
bdukes Nov 5, 2020
dcd3962
Implement EnablePopups switch in portal settings PB module
donker Nov 6, 2020
d27f09d
Merge pull request #4281 from donker/enablepopupssetting
valadas Nov 6, 2020
390a4f5
Merge branch 'develop' into rebase-980
valadas Nov 7, 2020
55d676f
Optimised images with calibre/image-actions
github-actions[bot] Nov 7, 2020
8e19f0e
Merge pull request #4283 from dnnsoftware/rebase-980
valadas Nov 7, 2020
3069466
Add Inject module hyperlink and inline editor enabled to personabar s…
donker Nov 8, 2020
ece3bde
fixed build error.
tauqeer-haider Nov 8, 2020
7a0bef0
Merge pull request #4279 from tauqeer-haider/bugfix/DNN-17451
valadas Nov 8, 2020
a32b1cf
Merge pull request #4286 from donker/implement2settings
valadas Nov 8, 2020
a8dcc22
Resolves some more build warnings on Library project (#4243)
valadas Nov 9, 2020
8a2b1c3
Obsolete the EnableSkinWidgets portal setting and remove it from seri…
donker Nov 6, 2020
8a32f56
To go with last commit
donker Nov 6, 2020
a3c0742
Further removal of EnableSkinWidgets
donker Nov 8, 2020
7cc4941
Tweak to obsolete wording
donker Nov 9, 2020
73bae57
Update DNN Platform/DotNetNuke.Abstractions/Portals/IPortalSettings.cs
donker Nov 9, 2020
7a80ab6
Update DNN Platform/Library/Entities/Portals/PortalSettings.cs
donker Nov 9, 2020
c1be511
Rolling back changes
donker Nov 9, 2020
d5d6d2b
Merge pull request #4290 from dnnsoftware/release/9.8.0
valadas Nov 10, 2020
06f747b
Merge pull request #4259 from bdukes/remove-dataprovider-deprecations
valadas Nov 11, 2020
9ff814d
Merge pull request #4258 from bdukes/fix-unclosed-datareader
valadas Nov 11, 2020
1c5b7d8
More stylecop fixes on DotNetNuke.Web project
valadas Nov 11, 2020
a205708
More stylcop warnings fixes on library project
valadas Nov 11, 2020
44ea3f7
Apply suggestions from code review
bdukes Nov 12, 2020
3772014
Fixes invalid extension error message for 0 errors
kmuralidaran Oct 28, 2020
d7f7bcc
Merge pull request #4287 from donker/cleansettings
mitchelsellers Nov 12, 2020
5e80599
Issue-4300 - Password validation lines are fixed
berkarslan-xo Nov 13, 2020
6e1385a
Fix data provider always failing (#4302)
bdukes Nov 13, 2020
40b2a89
Ensure no expression-bodies properties in DTO objects
donker Nov 16, 2020
df8195e
Update bug report template after 9.8.0 release
bdukes Nov 17, 2020
fd6efcf
Merge pull request #4315 from bdukes/update-bug-report-after-9.8.0
valadas Nov 17, 2020
c4ea928
remove dragover state from element when dragged BETWEEN pages
tauqeer-haider Nov 21, 2020
b9315a9
Fix build error
bdukes Nov 22, 2020
f4f5c71
Merge pull request #4326 from bdukes/fix-build-error
valadas Nov 23, 2020
93105d3
Fixed AddContentItem to only override the CreatedByUserId if the Cont…
SkyeHoefling Nov 20, 2020
65875f6
Added unit tests
SkyeHoefling Nov 20, 2020
ecf4efc
Fixed last unit test
SkyeHoefling Nov 20, 2020
8dc4429
Use YAML for build pipeline
bdukes Nov 20, 2020
4407ec1
Add triggers config for YAML build
bdukes Nov 23, 2020
2fa3ad8
Merge pull request #4249 from bdukes/fix-build-badge
mitchelsellers Nov 24, 2020
fdc773c
Fix some integration tests (#4250)
bdukes Nov 24, 2020
aa66db1
Merge pull request #4321 from ahoefling/4002_content_items
mitchelsellers Nov 24, 2020
3d80335
Merge pull request #4325 from tauqeer-haider/bugfix/DNN-18348
valadas Nov 24, 2020
981dcde
Merge branch 'develop' into yaml-build
valadas Nov 24, 2020
724ea6c
Merge pull request #4327 from bdukes/yaml-build
valadas Nov 24, 2020
cfdaa69
Trying to adjust included branches for azure pipeline
valadas Nov 24, 2020
d24ad9e
Use latest Cake.Frosting
bdukes Nov 20, 2020
229ef93
Merge pull request #4330 from dnnsoftware/azure-pipeline-branches
valadas Nov 24, 2020
4dc4856
Fix some build issues
bdukes Nov 20, 2020
383a18f
Revert to older version of GitVersion
bdukes Nov 21, 2020
2661f4b
Show more details from build
bdukes Nov 21, 2020
7a7f2a1
Fix bad build number
bdukes Nov 21, 2020
62acf88
Move Cake logging to later tasks
bdukes Nov 21, 2020
71257e5
Remove tools from NuGet
bdukes Nov 21, 2020
1ecd6f8
Move some logic out of Context class and into task
bdukes Nov 21, 2020
19f08ac
Update Cake.NuGet
bdukes Nov 21, 2020
b3dd4a8
Move GetFilesByPatterns into this project
bdukes Nov 21, 2020
10c20ed
Install NuGet as a tool
bdukes Nov 21, 2020
00ee891
Fix settings file path
bdukes Nov 22, 2020
19730ba
Trying windows-latest vm image
valadas Nov 23, 2020
e77f152
Trying to install .net core 2 sdk before build happens
valadas Nov 23, 2020
3a56796
Trying to preinstall 5.0 SDK
valadas Nov 23, 2020
03355d1
Added build platform x64
valadas Nov 23, 2020
a0358ff
Trying to define the buildPlatform variable differently
valadas Nov 23, 2020
0aa52e3
Trying includePreviousVersions
valadas Nov 23, 2020
ca1be72
Use .NET Core 3.1 for build
bdukes Nov 23, 2020
d492c5c
Fix build platform value
bdukes Nov 23, 2020
8f63262
Try using .NET 4.8 for Cake.Frosting
bdukes Nov 23, 2020
cba0154
Resolves multple build auto-fixable warnings in solution.
valadas Oct 27, 2020
2fccd9d
Changed WebConfigurationManager for System.Configuration.Configuratio…
davidjrh Oct 20, 2020
dbdc081
Trying .Net 5.0.100 instead of 5.0.100-rc.2.20479.15
valadas Nov 26, 2020
66bf596
Removes .Net install from pipeline
valadas Nov 26, 2020
bb80fc1
Matching build settings for unit tests
valadas Nov 26, 2020
ae00bba
Should resolve unit tests not running
valadas Nov 26, 2020
b2452bb
Issue-4336 - Umlaut characters in URL cause module setting error (#4337)
berkarslan-xo Nov 28, 2020
a23b4f7
Update BUILD documentation for Cake v1 changes
david-poindexter Nov 29, 2020
d04c98a
Merge pull request #4339 from dnnsoftware/david-poindexter-patch-1
mitchelsellers Nov 30, 2020
b1f3e08
Use variable for cake verbosity
bdukes Nov 30, 2020
927cc7b
Merge pull request #4322 from bdukes/cake-frosting
valadas Nov 30, 2020
054a0e2
Update vsdoc file for jQuery to 3.4.1
bdukes Dec 1, 2020
2c09377
Inherit Monaco font (instead of using Roboto)
bdukes Dec 7, 2020
bc1b33e
Merge pull request #4345 from bdukes/monaco-font
valadas Dec 8, 2020
ddc98b2
Removed elemets and marked obsolete the methods that need to stay due…
mitchelsellers Dec 8, 2020
b1850f6
Merge pull request #4341 from bdukes/jquery-vsdoc-3.4.1
mitchelsellers Dec 8, 2020
fe6a41b
Adjusted project structure and templates to support proper sitemap co…
mitchelsellers Dec 8, 2020
6f39bf9
Revert "Simplify cookie setting to avoid duplicate language cookies b…
bdukes Dec 8, 2020
0eab051
Merge pull request #4347 from mitchelsellers/fix/4346-RUnningDefault
valadas Dec 8, 2020
6b98a40
Merge pull request #4351 from bdukes/language-cookie
valadas Dec 9, 2020
27c6974
Adjusts build to support upgrades from De-Teleriked Dnn (#4350)
valadas Dec 10, 2020
9010482
Merge pull request #4197 from tauqeer-haider/bugfix/DNN-31641
mitchelsellers Dec 11, 2020
f97a115
Don't check user permissions unless there's a user
bdukes Dec 11, 2020
4fcc601
Fixed for anti-pattern Obsolete
mitchelsellers Dec 8, 2020
1950f47
Update DNN Platform/Library/Security/PortalSecurity.cs
mitchelsellers Dec 8, 2020
bd81293
Apply suggestions from code review
mitchelsellers Dec 8, 2020
673c59e
Resolves a build error from using deprecated enum value.
valadas Dec 9, 2020
e837d96
Merge pull request #4356 from bdukes/imagehandler-403-fix
valadas Dec 14, 2020
18ea554
Fix AssemblyInstaller failing to RemoveBindingRedirect when action="U…
dimarobert Dec 14, 2020
043c74c
Add assertion to test
bdukes Dec 14, 2020
2d0f9d2
Clean up warnings
bdukes Dec 14, 2020
cf0a883
DNN-42147 Denying permission (#4364)
mikebigun Dec 15, 2020
03fd439
Adjust flaky test away from ExpectedException
bdukes Dec 15, 2020
b2d5080
Merge pull request #4365 from bdukes/flaky-test
valadas Dec 16, 2020
44ff323
Remove duplicate references
bdukes Dec 16, 2020
2698dab
Remove more duplicate references
bdukes Dec 16, 2020
aba11b3
Enable warnings as errors for CountryListBox
bdukes Dec 16, 2020
85ca52b
Suppress documentation suggestion in test projects
bdukes Dec 15, 2020
61f27e7
Turn on TreatWarningsAsErrors for test projects
bdukes Dec 15, 2020
1b8d36c
Merge pull request #4368 from bdukes/remove-duplicate-references
valadas Dec 16, 2020
df2e3f1
Merge pull request #4366 from bdukes/dev-cleanup-test
valadas Dec 16, 2020
d7ebd22
Merge pull request #4376 from bdukes/warnings-country-list-box
valadas Dec 17, 2020
2b5853c
Clean up warnings in DnnExportImport
bdukes Dec 16, 2020
9b44ea9
Enable warnings as errors for HTML Editor Manager (#4381)
bdukes Dec 21, 2020
f109467
Enable warnings as errors for GTM Connector (#4380)
bdukes Dec 21, 2020
3697971
Enable warnings as errors for Azure Connector (#4379)
bdukes Dec 21, 2020
3089b72
Enable warnings as errors for ModulePipeline (#4378)
bdukes Dec 21, 2020
0ac8664
Enable warnings as errors for AspNetClientCapability (#4377)
bdukes Dec 21, 2020
59125c4
Clean up warnings in CKEditorProvider (#4374)
bdukes Dec 21, 2020
a11a532
Enable warnings as errors for SimpleWebFarmCachingProvider (#4371)
bdukes Dec 21, 2020
ea60516
Enable warnings as errors for 3rd party auth (#4372)
bdukes Dec 21, 2020
4d663b5
Resolve warnings in DnnExportImportLibrary (#4370)
bdukes Dec 21, 2020
aa5e759
Enable warnings as errors in Dnn.EditBar.Library (#4369)
bdukes Dec 21, 2020
5e6ffc2
Enable warnings as errors for JWT (#4375)
bdukes Dec 21, 2020
016ebf6
Merge pull request #4373 from bdukes/warnings-import-export
valadas Dec 21, 2020
ce4409b
Updates versions as per release candidate creation
github-actions[bot] Dec 23, 2020
b18a1b9
Merge pull request #4391 from dnnsoftware/update-versions/patch-016ebf6
valadas Dec 24, 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
Prev Previous commit
Next Next commit
Revert "Merge branch 'bugfix/DNN-44083' of https://github.com/kmurali…
…daran/Dnn.Platform into bugfix/DNN-44083"

This reverts commit 02fb399, reversing
changes made to b78f1b8.
  • Loading branch information
kmuralidaran authored and bdukes committed Oct 15, 2020
commit 22ad952636c467c69cfc006b200906c38b9a82bf
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,8 @@ protected string RedirectURL
get
{
var redirectURL = string.Empty;
var redirectAfterLoginUrl = Convert.ToInt32(GetSetting(this.PortalId, "Redirect_AfterLogin"));
var isValidRedirectAfterLoginUrl = this.NeedRedirectAfterLogin
&& redirectAfterLoginUrl != Null.NullInteger;

var setting = GetSetting(this.PortalId, "Redirect_AfterLogin");

// first we need to check if there is a returnurl
if (this.Request.QueryString["returnurl"] != null)
Expand Down Expand Up @@ -112,12 +111,6 @@ protected string RedirectURL
redirectURL = UrlUtils.ValidReturnUrl(redirectURL);
}

// Reset redirect url for redirecting to 'Redirect After Login' page
if (isValidRedirectAfterLoginUrl)
{
redirectURL = string.Empty;
}

var alias = this.PortalAlias.HTTPAlias;
var comparison = StringComparison.InvariantCultureIgnoreCase;

Expand All @@ -127,9 +120,12 @@ protected string RedirectURL

if (string.IsNullOrEmpty(redirectURL) || isDefaultPage)
{
if (isValidRedirectAfterLoginUrl && (isDefaultPage || this.IsRedirectingFromLoginUrl()))
if (
this.NeedRedirectAfterLogin
&& (isDefaultPage || this.IsRedirectingFromLoginUrl())
&& Convert.ToInt32(setting) != Null.NullInteger)
{
redirectURL = this._navigationManager.NavigateURL(redirectAfterLoginUrl);
redirectURL = this._navigationManager.NavigateURL(Convert.ToInt32(setting));
}
else
{
Expand Down