Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merges latest changes from 9.4.x into development (#3290)
* Do not store these portal settings when setting their property on the portalsettings object * Removed DnnHttpControllerActivator and added DependencyResolver implementation using the IServiceProvider * Added xml comments for the new DnnDependencyResolver * Added DnnDependencyResolver Unit Tests * Replaced IServiceProvider mock with full IServiceProvider implementation to work with Web API tests * Added more unit tests for the DnnDependencyResolver to cover GetServices (multiple) and BeginScope * Do not show "No Search results" message when no search is performed. (#3203) * Revision of build process part 1 (#3137) * Move website folder * repairs * Update Cake * Move external task to its own file * Begin packaging scripts in cake * Further work on packaging * Ensure Telerik project also gets new version nr * Move Telerik PDF to its proper place * New logic for packages that are already in final form in the repo and just need to be zipped. * Bring fips Lucene lib back under git control * Newtonsoft package and repair to telerik package * Splitting off other tasks * Upgrade and deploy packages * Symbols package * Get rid of platform ver in manifest * Final fixes - working packages * Move compilation stuff * House cleaning * peg utils version * Fix to ckep script * suppress warnings * Variable initialization issue * Removing unused scripts * Revert change to Telerik package version * Move "other" to "thirdparty" * Get rid of hard coded Newtonsoft version * Max cpu to 4 for compiling * Repairs to MSBuild scripts to get AE to build properly * Correcting paths * Cleaning up * Trying to fix ignore file * Update Build/Cake/thirdparty.json Co-Authored-By: Brian Dukes <bdukes@engagesoftware.com> * Remove absolute path from .gitignore * Fix extension of DNC library package * Merging AE and DNN build scripts * Fixes to scripts * Clean up symbols project for AE since they are included in DNN project now * Add previously untracked Yahoo compressor dlls * Remove version information from SolutionInfo.cs * Fix errors introduced in rebase * Fix incorrect paths * Change build order of MSBuild to build extensions before personabar ui. * Make white-space visible in log viewer (#3198) * DNN-34236: check the url with case insensitive. * DNN-29417 Username is changed to email address in the user profile if the "Use Email Address as Username" is enabled. * Fix to installer and the dependencies of the HTML and DA modules * DNN-24945 - Always redirect to the source portal page after creating (#3223) group * Fix Typo (#3234) * Improve querystring parse (#3242) * Improve props popup * Improve input checking of sites (#3243) * Fixes an upgrade issue that affects 9.4.1 => 9.4.2 upgrades (#3282) * Fixes an issue with a duplication of assembly binding * Removed hardcode version in manifest * Further reorganization of build process (#3236) * Introduce settings and add custom version nr * Ability to create a local dev site * Move node workspaces to root * Reshuffling of variables in MSBuild * Repairs * Fix * Allow local override of global build variables * Only save manifests if the file is not there. This prevents overwriting in case of a failed build before. * Ensure projects build in debug to the website path specified by the platform build settings * Don't track vscode folder * Fixes #3168 Test Sending Email Issues (#3237) * Use Admin Email for Send if smtpHostMode false * Fix Test Email Settings TO and FROM Addresses If I did this right and it should make sense is I set the test email to be able to go to the user testing. After all they are who are trying to make it work. It can be any email used by anyone and usually to see this feature you are a host or portal administrator so security should not be as much of a concern here. The FROM address will use the HOST email settings if set to HOST mode in DNN for the portal, otherwise it should use the Portal Administrators Email account to send from. This however does not address the issue of using the email address supplied in settings and creating another setting which will be applied next to figure out the correct logic. * Update ServerSettingsSmtpAdminController.cs * Fix build issue to previous changes. PortalSettings.UserInfo.Email is this the current user email? I am still getting my things setup. I ran VS 2019 to build successfully and I am trying to read through the namespaces correctly so I can understand the changes. I noticed a number of files possibly needing updates due to being deprecated in 9.4.2 but after I changed the namespace issue those warnings went away. One last thought is how do you get intellisense working on DNN solution. Is that a dream to have or am I missing something in my setup? * Change to address to the current user's email testing the server. I believe a UI to set the TO address would be nice to help troubleshoot and address issues trying to send to a specific user. * Corrected To address for current user email * TO Current User Email * DNN-29110 Site Assets > Select All is not working (#3251) * DNN-29110 Site Assets > Select All is not working * Code review fix * Moves Remember Login above Login Button: referenced in issue #2471 #3255 (#3256) * Move Remember Login Above Login Button * Update Login.ascx * file copy paste issue... * DNN-34250 Search is not working even after re-Indexing Search for All DNN Portals (#3260) * Fixes duplication in DotNetNuke.Website.csproj * Removed reference to missing LeftMenu files
- Loading branch information
