Merges latest changes from 9.4.x into development #3290
Merged
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
… portalsettings object
…mentation using the IServiceProvider
…ion to work with Web API tests
…ces (multiple) and BeginScope
* 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.
check the url with case insensitive.
Portal settings setters should not persist to DB
… the "Use Email Address as Username" is enabled.
* Improve props popup
…are#3282) * Fixes an issue with a duplication of assembly binding * Removed hardcode version in manifest
* 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
* 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 * Code review fix
…are#2471 dnnsoftware#3255 (dnnsoftware#3256) * Move Remember Login Above Login Button * Update Login.ascx * file copy paste issue...
bdukes
reviewed
Nov 14, 2019
Comment on lines
1107
to
3441
| <Content Include="Resources\Shared\components\CodeEditor\mode\sparql\sparql.js" /> | ||
| <Content Include="Resources\Shared\components\CodeEditor\mode\spreadsheet\index.html" /> | ||
| <Content Include="Resources\Shared\components\CodeEditor\mode\spreadsheet\spreadsheet.js" /> | ||
| <Content Include="Resources\Shared\components\CodeEditor\mode\sql\index.html" /> | ||
| <Content Include="Resources\Shared\components\CodeEditor\mode\sql\sql.js" /> | ||
| <Content Include="Resources\Shared\components\CodeEditor\mode\stex\index.html" /> | ||
| <Content Include="Resources\Shared\components\CodeEditor\mode\stex\stex.js" /> | ||
| <Content Include="Resources\Shared\components\CodeEditor\mode\stex\test.js" /> | ||
| <Content Include="Resources\Shared\components\CodeEditor\mode\stylus\index.html" /> | ||
| <Content Include="Resources\Shared\components\CodeEditor\mode\stylus\stylus.js" /> | ||
| <Content Include="Resources\Shared\components\CodeEditor\mode\swift\index.html" /> | ||
| <Content Include="Resources\Shared\components\CodeEditor\mode\swift\swift.js" /> | ||
| <Content Include="Resources\Shared\components\CodeEditor\mode\tcl\index.html" /> | ||
|
|
There was a problem hiding this comment.
Looks like this file got duplicated in the merge
There was a problem hiding this comment.
Yep, just resubmitted, let's see...
|
I will tackle the other build issues later tonight... |
|
Should be fixed now |
bdukes
approved these changes
Nov 15, 2019
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.
Summary
This is a release management task to merge the latest changes from the release/9.4.x branch into the development branch, for this reason we are self approving it as per our release management policies