diff --git a/README.md b/README.md
index 8f89209328..3184d2024d 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ The easiest way to get started is to run `build/build.bat` which will build both
If you're interested in making changes to Belle without running Visual Studio make sure to read the [Belle ReadMe file](src/Umbraco.Web.UI.Client/README.md).
-Note that you can always [download a nightly build (to be found in the artifacts tab)](https://ci.appveyor.com/project/Umbraco/umbraco-cms-hs8dx/history/branch/dev-v7) so you don't have to build the code yourself.
+Note that you can always [download a nightly build](http://nightly.umbraco.org/?container=umbraco-750) so you don't have to build the code yourself.
## Watch a introduction video ##
diff --git a/appveyor.yml b/appveyor.yml
index eaba82e666..3044444730 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -35,7 +35,18 @@ test:
assemblies: src\Umbraco.Tests\bin\Debug\Umbraco.Tests.dll
artifacts:
- path: build\UmbracoCms.*
+ name: UmbracoFiles
- path: build\msbuild.log
+ name: BuildLog
+deploy:
+- provider: AzureBlob
+ storage_account_name: umbraconightlies
+ storage_access_key:
+ secure: bmEMml2SF7QLHULiePa/a01XOeIa2SxJeXuaZ+1R27b+Vb2nNUQVYiPlUyF2cZAFSHI/zO/LekRsVU1rTescGhJjF7SSjKybymI3p+F/OWpwqiu2WfFee1ofXBFx8QHw
+ container: umbraco-750
+ artifact: UmbracoFiles
+ on:
+ branch: dev-v7
notifications:
- provider: Slack
auth_token:
diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 6903c34d8d..54d12f6844 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -16,7 +16,7 @@
umbraco
-
+
@@ -45,4 +45,4 @@
-
\ No newline at end of file
+
diff --git a/build/UmbracoVersion.txt b/build/UmbracoVersion.txt
index 4b66ecc866..b035e059fb 100644
--- a/build/UmbracoVersion.txt
+++ b/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.0
\ No newline at end of file
+7.5.1
\ No newline at end of file
diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 8225614a3a..52ddd99a97 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -12,4 +12,4 @@ using System.Resources;
[assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyFileVersion("7.6.0")]
-[assembly: AssemblyInformationalVersion("7.6.0-alpha003")]
\ No newline at end of file
+[assembly: AssemblyInformationalVersion("7.6.0-alpha004")]
\ No newline at end of file
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index 866c271f57..aaf0ec0619 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -24,7 +24,7 @@ namespace Umbraco.Core.Configuration
/// Gets the version comment (like beta or RC).
///
/// The version comment.
- public static string CurrentComment { get { return "alpha003"; } }
+ public static string CurrentComment { get { return "alpha004"; } }
// Get the version of the umbraco.dll by looking at a class in that dll
// Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx
diff --git a/src/Umbraco.Web.UI.Client/bower.json b/src/Umbraco.Web.UI.Client/bower.json
index 09cfa16609..0f3eea3291 100644
--- a/src/Umbraco.Web.UI.Client/bower.json
+++ b/src/Umbraco.Web.UI.Client/bower.json
@@ -22,6 +22,7 @@
"bootstrap-social": "~4.8.0",
"jquery": "2.2.4",
"jquery-ui": "1.11.4",
+ "jquery-migrate": "1.4.0",
"angular-dynamic-locale": "0.1.28",
"ng-file-upload": "~7.3.8",
"tinymce": "~4.1.10",
diff --git a/src/Umbraco.Web.UI.Client/gruntFile.js b/src/Umbraco.Web.UI.Client/gruntFile.js
index 946966d358..0a28d9efaf 100644
--- a/src/Umbraco.Web.UI.Client/gruntFile.js
+++ b/src/Umbraco.Web.UI.Client/gruntFile.js
@@ -491,6 +491,10 @@ module.exports = function (grunt) {
keepExpandedHierarchy: false,
files: ['jquery-ui.min.js']
},
+ 'jquery-migrate': {
+ keepExpandedHierarchy: false,
+ files: ['jquery-migrate.min.js']
+ },
'tinymce': {
files: ['plugins/**', 'themes/**', 'tinymce.min.js']
},
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
index 339ee9d455..feaed67ed9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
@@ -114,7 +114,7 @@
-
+
+
umbraco.aspx
@@ -746,7 +747,6 @@
-
@@ -1560,7 +1560,6 @@
-
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index e07feb0549..89f3152438 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -1395,11 +1395,11 @@ To manage your website, simply open the Umbraco back office and start adding con
%0%.]]>
%0%. If they aren't being written to no action need be taken.]]>
- X-Frame-Options used to control whether a site can be IFRAMed by another was found.]]>
- X-Frame-Options used to control whether a site can be IFRAMed by another was not found.]]>
+ X-Frame-Options used to control whether a site can be IFRAMEd by another was found.]]>
+ X-Frame-Options used to control whether a site can be IFRAMEd by another was not found.]]>
Set Header in Config
- Adds a value to the httpProtocol/customHeaders section of web.config to prevent the site being IFRAMed by other websites.
- A setting to create a header preventing IFRAMing of the site by other websites has been added to your web.config file.
+ Adds a value to the httpProtocol/customHeaders section of web.config to prevent the site being IFRAMEd by other websites.
+ A setting to create a header preventing IFRAMEing of the site by other websites has been added to your web.config file.
Could not update web.config file. Error: %0%