Bumps version

#U4-8884 Fixed

build/NuSpecs/UmbracoCms.nuspec

@@ -16,7 +16,7 @@
     <tags>umbraco</tags>
     <dependencies>
       <dependency id="UmbracoCms.Core" version="[$version$]" />
-      <dependency id="Newtonsoft.Json" version="[6.0.8, 9.0.0)" />
+      <dependency id="Newtonsoft.Json" version="[6.0.8, 10.0.0)" />
       <dependency id="Umbraco.ModelsBuilder" version="[3.0.4, 4.0.0)" />
     </dependencies>
   </metadata>
@@ -45,4 +45,4 @@
     <file src="tools\Views.Web.config.install.xdt" target="Views\Web.config.install.xdt" />
     <file src="build\**" target="build" />
   </files>
-</package>
+</package>

build/UmbracoVersion.txt

@@ -1,2 +1,2 @@
 # Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
-7.5.1
+7.5.2

src/SolutionInfo.cs

@@ -11,5 +11,5 @@ using System.Resources;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyFileVersion("7.5.1")]
-[assembly: AssemblyInformationalVersion("7.5.1")]
+[assembly: AssemblyFileVersion("7.5.2")]
+[assembly: AssemblyInformationalVersion("7.5.2")]

src/Umbraco.Core/Configuration/UmbracoVersion.cs

@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
     public class UmbracoVersion
     {
-        private static readonly Version Version = new Version("7.5.1");
+        private static readonly Version Version = new Version("7.5.2");
 
         /// <summary>
         /// Gets the current version of Umbraco.

src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

@@ -2412,9 +2412,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7510</DevelopmentServerPort>
+          <DevelopmentServerPort>7520</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7510</IISUrl>
+          <IISUrl>http://localhost:7520</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

src/Umbraco.Web.UI/umbraco_client/Tree/jquery.tree.contextmenu.js

@@ -122,7 +122,8 @@
     $(function () {
         $.tree.plugins.contextmenu.object.hide().appendTo("body");
         $("a", $.tree.plugins.contextmenu.object[0])
-			.on("click", function (event) {
+            //has to be .live, do not change to .on, it doesn't work
+			.live("click", function (event) {
 			    if (!$(this).hasClass("disabled")) {
 			        $.tree.plugins.contextmenu.exec.apply(null, [$(this).attr("rel")]);
 			        $.tree.plugins.contextmenu.hide();

src/Umbraco.Web.UI/umbraco_client/Tree/jquery.tree.js

@@ -395,7 +395,8 @@
                 //** THIS IS A MODIFICATION TO JSTREE, IN FIREFOX THE ORIGINAL CONTEXT OF THIS SELECTOR IS LOST IN THE TINY MCE OVERLAY
                 //$("li", this.container.get(0))
                 $("#" + this.container.attr("id") + " li")
-					.on("click", function (event) { // WHEN CLICK IS ON THE ARROW
+                    //has to be .live, do not change to .on, it doesn't work
+					.live("click", function (event) { // WHEN CLICK IS ON THE ARROW
 					    if (event.target.tagName != "LI") return true;
 					    _this.off_height();
 					    if (event.pageY - $(event.target).offset().top > _this.li_height) return true;
@@ -404,7 +405,8 @@
 					    return false;
 					});
                 $("a", this.container.get(0))
-					.on("click", function (event) { // WHEN CLICK IS ON THE TEXT OR ICON
+                    //has to be .live, do not change to .on, it doesn't work
+					.live("click", function (event) { // WHEN CLICK IS ON THE TEXT OR ICON
 					    if (event.which && event.which == 3) return true;
 					    if (_this.locked) {
 					        event.preventDefault();
@@ -417,7 +419,8 @@
 					    event.target.blur();
 					    return false;
 					})
-					.on("dblclick", function (event) { // WHEN DOUBLECLICK ON TEXT OR ICON
+                    //has to be .live, do not change to .on, it doesn't work
+					.live("dblclick", function (event) { // WHEN DOUBLECLICK ON TEXT OR ICON
 					    if (_this.locked) {
 					        event.preventDefault();
 					        event.stopPropagation();
@@ -429,14 +432,16 @@
 					    event.stopPropagation();
 					    event.target.blur();
 					})
-					.on("contextmenu", function (event) {
+                    //has to be .live, do not change to .on, it doesn't work
+					.live("contextmenu", function (event) {
 					    if (_this.locked) {
 					        event.target.blur();
 					        return _this.error("LOCKED");
 					    }
 					    return _this.callback("onrgtclk", [_this.get_node(event.target).get(0), _this, event]);
 					})
-					.on("mouseover", function (event) {
+                    //has to be .live, do not change to .on, it doesn't work
+					.live("mouseover", function (event) {
 					    if (_this.locked) {
 					        event.preventDefault();
 					        event.stopPropagation();
@@ -448,7 +453,8 @@
 					    }
 					    _this.callback("onhover", [_this.get_node(event.target).get(0), _this]);
 					})
-					.on("mousedown", function (event) {
+                    //has to be .live, do not change to .on, it doesn't work
+					.live("mousedown", function (event) {
 					    if (_this.settings.rules.drag_button == "left" && event.which && event.which != 1) return true;
 					    if (_this.settings.rules.drag_button == "right" && event.which && event.which != 3) return true;
 					    _this.focus.apply(_this);

src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx

@@ -9,6 +9,7 @@
 	<umb:CssInclude ID="CssInclude2" runat="server" FilePath="css/permissionsEditor.css" PathNameAlias="UmbracoRoot" />
 	<umb:CssInclude ID="CssInclude1" runat="server" FilePath="css/umbracoGui.css" PathNameAlias="UmbracoRoot" />
 	<umb:JsInclude ID="JsInclude1"  runat="server" FilePath="PermissionsEditor.js" />
+	<umb:JsInclude ID="JsInclude2"  runat="server" FilePath="../lib/jquery-migrate/jquery-migrate.min.js" />	
 	
 </asp:Content>
 <asp:Content ContentPlaceHolderID="body" runat="server">
@@ -19,7 +20,8 @@
 				<umbraco:TreeControl runat="server" ID="JTree" App="content"
 				    Mode="Checkbox" CssClass="clearfix"></umbraco:TreeControl>				
 			</div>
-			<div id="permissionsPanel">
+
+			<div id="permissionsPanel" style="margin-top: -35px">
 				<user:NodePermissions ID="nodePermissions" runat="server" />
 			</div>			
 			

src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.designer.cs

@@ -39,6 +39,15 @@ namespace umbraco.cms.presentation.user {
         /// </remarks>
         protected global::ClientDependency.Core.Controls.JsInclude JsInclude1;
         
+        /// <summary>
+        /// JsInclude2 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::ClientDependency.Core.Controls.JsInclude JsInclude2;
+        
         /// <summary>
         /// pnlUmbraco control.
         /// </summary>