Merge from upstream #2

mtrutledge · 2020-06-16T19:53:51Z

Summary

* Fixes to build process * Last fix

Fixed widget.js 404 error

Co-Authored-By: Brian Dukes <bdukes@engagesoftware.com>

@DaveMartinSE

Fixes #3634, thanks @DaveMartinSE! Error message states: >If a custom controller factory is in use, make sure that it creates a >new instance of the controller for each request.

Updates develop with latest changes from release/9.5.1

…to develop

…into develop

Fix #3644.

…ng text will all start at the same left position.

…if an existing module from other tab is on the page. (#3652)

* validate file upload request. Fix #3654. * including the portal id and user id parameter.

Fixes #3662

Invalid Username/Email Address When Containing "onfocus"

fix an issue determing the batch size

SiteGroups Personabar Extension

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1507.md

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1508.md

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1509.md

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1512.md

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1513.md

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1514.md

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1515.md

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1516.md

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1518.md

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1519.md

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1520.md

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1610.md

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1615.md

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1617.md

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1623.md

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1626.md

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1629.md

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1633.md

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1642.md

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1643.md

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1200.md

Update ComposeMessage.js

…stuff-things Update display of server log files

Fixed NullReferenceException when StandardFolderProvider is used in a Search provider task

StyleCop fixes

* Update ComposeMessage.js * Update Settings.ascx Closes #3682 * Revert MaxLength change * Update Settings.ascx Co-authored-by: Brian Dukes <bdukes@engagesoftware.com>

Closes dnnsoftware#5262 It was a bit of a rabbit hole to go down to figure this one out. Initially I thought the CDF had an error serving javascript with a css mime type. But the underlying issue is that with Stencil.js there is a main script that registers individual components scripts in a different way depending on browser support and loads or not some polyfills accordingly (very efficient). This means that that "entry" file was served by the CDF but the file attempts to load it's "component details" files relative to that path. Unfortunatelly thanks to CDF, that relative path was the CDF handler itselft instead of the path to the other js files. And the CDF defaults to css mime type if it can't figure out the right one. The Client Dependency Framework does not support javascript modules (because of script relative paths) and there are no plans to add such support according to their repository. Also with this modern way of lazy-loading and with modern http2 having compression and multiplexing, bundling those files is actually a performance hit and not recommended. Which left us with a couple options: 1. Not take advantage of Js modules by bundling all js files (but this compile target was deprecated by Stencil for the reasons above), so it would have taken quite some time and incur a performance hit instead of a boost. 2. Not use CDF for this project, but this was broken if hosting in a virtual directory (IIS Application under an IIS site folder). This PR implementes #2 but adds support for ApplicationPath to the existing Request SPA token. This new token support can also be very useful for other SPA modules. So under normal hosting, this returns `/` but if the site is hosted in a dnn subdirectory it will return '/dnn' (or whataver the web path is for that web application. I think this will cover all scenarios here.

donker and others added 30 commits March 8, 2020 10:32

Fixes to build process (#3618)

c5f60b9

* Fixes to build process * Last fix

Fixed jquery.ui.widget 404

c2ed3b9

Merge pull request #3631 from daguiler/bugfix/DNN-37504

c2f26e0

Fixed widget.js 404 error

Fixed jquery.ui.widget 404

676af83

Update DNN Platform/Library/Data/DataProvider.cs

258d33d

Co-Authored-By: Brian Dukes <bdukes@engagesoftware.com>

Update DNN Platform/Library/Common/Utilities/FileExtensionWhitelist.cs

05e8a2c

Co-Authored-By: Brian Dukes <bdukes@engagesoftware.com>

Fix errors setting up dev site (#3642)

958eef7

Don't re-use MVC controllers (#3635)

6be4167

Fixes #3634, thanks @DaveMartinSE! Error message states: >If a custom controller factory is in use, make sure that it creates a >new instance of the controller for each request.

DNN-30135 - GetMenuItem is made thread-safe (#3640)

c55e0d7

Merge pull request #3643 from dnnsoftware/release/9.5.1

a6bfc01

Updates develop with latest changes from release/9.5.1

Merge branch 'Fix3604' of https://github.com/sleupold/Dnn.Platform in…

936526e

…to develop

Merge branch 'develop' of https://github.com/dnnsoftware/Dnn.Platform …

b90c5f5

…into develop

check message attachment's permission.

2aab772

Fix #3644.

Fix broken unit tests.

aaeff3d

Replacing text-indent css property with margin-left, to insure wrappi…

33baec2

…ng text will all start at the same left position.

Fixed the issue that causes all modules to be relocated to same pane …

fd590cf

…if an existing module from other tab is on the page. (#3652)

validate file upload request. (#3655)

f6f6ef6

* validate file upload request. Fix #3654. * including the portal id and user id parameter.

Ensure the portal ID being used for consent is the parent portal

33e2db8

Fixes #3662

https://jira.devfactory.com/browse/DNN-33796

3de88de

Invalid Username/Email Address When Containing "onfocus"

Fixed Allow Indexing module setting

1b1cd88

Fixes #3658 by allowing a superuser to be returned for this query

1302a2a

Make sure to look up user against effective portal

f83988d

Fix Batch issue

522f9ba

fix an issue determing the batch size

First migration of SCullman's Connect.SiteGroups project

2718e06

Remove trace statements from adapter

27fa92f

Ensure proper logging of SiteGroup operations from within controller

46d81a5

Centralize logging for portal creation and deletion in the controller

274b164

SQL changes for logging of portal and portalgroup operations

5fc5ad4

Improvements to UI

a4c9d21

Merge pull request #3664 from donker/ae_sitegroups

ea019e4

SiteGroups Personabar Extension

bdukes and others added 28 commits June 12, 2020 10:01

SA1507

2031809

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1507.md

SA1508

b26ad8c

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1508.md

SA1509

76acbbc

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1509.md

SA1512

fe131c8

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1512.md

SA1513

8cd5a42

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1513.md

SA1514

860b876

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1514.md

SA1515

12a29c0

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1515.md

SA1516

4cd0fa2

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1516.md

SA1518

4cf55d4

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1518.md

SA1519

e4517f2

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1519.md

SA1520

a347b86

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1520.md

SA1610

1201d8b

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1610.md

SA1615

d6f5eba

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1615.md

SA1617

1cace60

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1617.md

SA1623

4bedbe2

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1623.md

SA1626

955db35

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1626.md

SA1629

878c5d1

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1629.md

SA1633

8c96fb9

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1633.md

SA1642

c91349e

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1642.md

SA1643

36e9f43

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1643.md

Added unit test for StandardFolderProvider

8052fc6

SA1200

084c087

See https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/1.1.118/documentation/SA1200.md

Merge pull request #3836 from MaiklT/develop

6b52c86

Update ComposeMessage.js

Merge pull request #3828 from EngageSoftware/server-log-sort-display-…

8c444bb

…stuff-things Update display of server log files

Merge pull request #3839 from daguiler/bugfix/std-folder-provider-nre

fb4e517

Fixed NullReferenceException when StandardFolderProvider is used in a Search provider task

Merge branch 'develop' into style-cop-fixes

1836150

Merge pull request #3831 from bdukes/style-cop-fixes

cc61549

StyleCop fixes

Removed maxlength from ViewProfiles/Settings.ascx (#3837)

0d2503d

* Update ComposeMessage.js * Update Settings.ascx Closes #3682 * Revert MaxLength change * Update Settings.ascx Co-authored-by: Brian Dukes <bdukes@engagesoftware.com>

mtrutledge merged commit 016f6f3 into mtrutledge:develop Jun 16, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge from upstream #2

Merge from upstream #2

mtrutledge commented Jun 16, 2020

Merge from upstream #2

Merge from upstream #2

Conversation

mtrutledge commented Jun 16, 2020

Summary