Compare commits

...

5 Commits

Author SHA1 Message Date
mikkelhm 6d052aeeac Bump version to 7.9.4 2018-04-10 08:56:50 +02:00
Dave Woestenborghs 9b33c8a0e2 U4-11149 fixed error when creating new xslt file (#2540)
* U4-10659 added create task back for xslt files

* Add fix to UI.Release.xml as well
2018-04-09 14:45:26 +02:00
Sebastiaan Janssen 967178cb92 Manually applies U4-11155 fixed error when creating member groups #2545 2018-04-09 11:43:48 +02:00
Warren Buckley fe44494936 Merge pull request #2550 from dawoe/temp-U4-11161
U4-11161 fix for adding multiple items in a single content picker
2018-04-09 11:42:18 +02:00
Shannon Deminick 793c9470c2 Manually applies merge pull request #2556 from dawoe/temp-U4-11167
U4-11167 Fixes rare syncTree error
2018-04-09 11:39:07 +02:00
10 changed files with 18 additions and 11 deletions
+2 -2
View File
@@ -11,5 +11,5 @@ using System.Resources;
[assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyFileVersion("7.9.3")]
[assembly: AssemblyInformationalVersion("7.9.3")]
[assembly: AssemblyFileVersion("7.9.4")]
[assembly: AssemblyInformationalVersion("7.9.4")]
@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
{
public class UmbracoVersion
{
private static readonly Version Version = new Version("7.9.3");
private static readonly Version Version = new Version("7.9.4");
/// <summary>
/// Gets the current version of Umbraco.
@@ -5,7 +5,6 @@ using Umbraco.Web.UI;
using umbraco;
using umbraco.BusinessLogic;
using umbraco.interfaces;
using Umbraco.Web.umbraco.presentation.umbraco.create;
namespace Umbraco.Tests.UI
{
@@ -288,9 +288,12 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
throw "args.tree cannot be null";
}
if (mainTreeEventHandler) {
//returns a promise
return mainTreeEventHandler.syncTree(args);
if (mainTreeEventHandler) {
if (mainTreeEventHandler.syncTree) {
//returns a promise,
return mainTreeEventHandler.syncTree(args);
}
}
//couldn't sync
@@ -66,6 +66,8 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
showOpenButton: false,
showEditButton: false,
showPathOnHover: false,
maxNumber: 1,
minNumber : 0,
startNode: {
query: "",
type: "content",
@@ -28,7 +28,7 @@
<localize key="general_add">Add</localize>
</a>
<div class="umb-contentpicker__min-max-help">
<div class="umb-contentpicker__min-max-help" ng-if="model.config.multiPicker === true">
<!-- Both min and max items -->
<span ng-if="model.config.minNumber && model.config.maxNumber && model.config.minNumber !== model.config.maxNumber">
+2 -2
View File
@@ -1023,9 +1023,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
<WebProjectProperties>
<UseIIS>True</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>7930</DevelopmentServerPort>
<DevelopmentServerPort>7940</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:7930</IISUrl>
<IISUrl>http://localhost:7940</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
@@ -19,6 +19,7 @@
<header>Macro</header>
<usercontrol>/create/xslt.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="XsltTasks" />
<delete assembly="umbraco" type="XsltTasks" />
</tasks>
</nodeType>
@@ -19,6 +19,7 @@
<header>Macro</header>
<usercontrol>/create/xslt.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="XsltTasks" />
<delete assembly="umbraco" type="XsltTasks" />
</tasks>
</nodeType>
@@ -2,9 +2,10 @@ using System.Linq;
using System.Web.Security;
using umbraco.BusinessLogic;
using umbraco.cms.businesslogic.member;
using Umbraco.Web;
using Umbraco.Web.UI;
namespace Umbraco.Web.umbraco.presentation.umbraco.create
namespace umbraco
{
public class MemberGroupTasks : LegacyDialogTask
{