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

Update development with fixes from v9.4.0-rc #2941

Merged
merged 2 commits into from
Aug 15, 2019
Merged

Conversation

valadas
Copy link
Contributor

@valadas valadas commented Aug 15, 2019

The referenced changes have already been approved. Since this is a release management task we are self approving the merge without any reviews.

bdukes and others added 2 commits August 13, 2019 20:31
When running tests, the following error occurs:
	VSTest: Could not locate executable.

cake-build/cake#1522 (comment)
indicates that there's an issue using VS 2019, and presents a workaround
to find the correct path
* DNN-31366 - TabController HasChildren returns false if all children are deleted

* Simplify HasChildren condition
@valadas
Copy link
Contributor Author

valadas commented Aug 15, 2019

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mitchelsellers mitchelsellers merged commit 94b73c2 into development Aug 15, 2019
sleupold added a commit to sleupold/Dnn.Platform that referenced this pull request Sep 1, 2019
…form into development

* 'development' of https://github.com/dnnsoftware/Dnn.Platform: (59 commits)
  Updating development with recent changes on release/9.4.x (dnnsoftware#2964)
  Removal of Obsolete Code (dnnsoftware#2869)
  Update development with fixes from v9.4.0-rc (dnnsoftware#2941)
  Enables and documents local builds (dnnsoftware#2932)
  Standardization of Messaging
  DNN-31339 DNN Platform: GetURL API in a file manager impacting CKEditor performance (dnnsoftware#2918)
  Ensure proper regex matching (dnnsoftware#2915)
  Bug template (dnnsoftware#2909)
  Removes duplication of license files for javascript libraries (dnnsoftware#2914)
  Bumps Excillion theme version (dnnsoftware#2913)
  Update Selectize library to 0.12.6 (dnnsoftware#2907)
  Added branching explanation to PR documentation
  DNN-30859 - Add unit test for Mail::AddAlternativeView
  DNN-30859 - Set AlternativeView.Encoding with bodyEncoding - This is to ensure AlternativeView encoding is always consistent with bodyEncoding and not relying on the body text - Extract the code to AddAlternateView method to allow UTs
  DNN-30859 - Add MailTests.cs to the project
  Update GlobalResources.resx (dnnsoftware#2891)
  Fixes an issue with the boolean values in the Google Analytics Connector (dnnsoftware#2877)
  Adjusted copyright
  Check file names for illegal characters
  DNN-29969 View.html file is not rendered via "Module Creator" update (dnnsoftware#2854)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants