Sebastiaan Janssen
43018e2793
Reverts CodeAnalysis update to stay compatible with Models builder
2017-04-10 13:35:20 +02:00
Shannon
9f2c428a7c
updates to latest Models Builder
2017-04-10 16:12:23 +10:00
Shannon
a958f946ef
bumps version (beta) so i can post the patch release
2017-04-08 13:57:43 +10:00
Sebastiaan Janssen
16582c8207
U4-9745 Update outdated NuGet dependencies
2017-04-06 16:27:41 +02:00
Shannon
2248a85876
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6
...
# Conflicts:
# build/NuSpecs/UmbracoCms.nuspec
# src/Umbraco.Core/Services/ContentTypeService.cs
# src/Umbraco.Web.UI.Client/src/views/dashboard/developer/examinemanagement.html
# src/Umbraco.Web.UI/packages.config
2017-04-03 21:50:22 +10:00
Stephan
4677faff38
Upgrade to ModelsBuilder 3.0.6
2017-03-30 08:54:01 +02:00
Shannon
c5f388f6bc
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6
...
# Conflicts:
# build/NuSpecs/UmbracoCms.Core.nuspec
# src/Umbraco.Tests/packages.config
# src/Umbraco.Web/Umbraco.Web.csproj
# src/Umbraco.Web/packages.config
# src/UmbracoExamine/UmbracoExamine.csproj
# src/umbraco.MacroEngines/packages.config
# src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
2017-03-30 17:03:51 +11:00
Shannon
6a1d60c5a7
U4-9692 Update to Examine 0.1.82
2017-03-30 15:43:06 +11:00
Shannon
7cdb48b6c9
bumps version
2017-03-29 16:35:37 +11:00
Sebastiaan Janssen
13aa615745
U4-9004 Remove URLRewriting.net dependency
2017-03-09 11:41:36 +01:00
Claus
7fa8f04b11
deploy-257 Downgrade Core and Deploy to framework 4.5
2017-03-08 11:20:48 +01:00
Sebastiaan Janssen
0b9a3ef68a
Bump version
2017-02-22 10:26:37 +01:00
Sebastiaan Janssen
52dce66598
Bump version
2017-02-21 08:49:34 +01:00
Claus
24063c403a
Merge remote-tracking branch 'origin/dev-v7.6' into temp-U4-1324
...
Conflicts:
src/Umbraco.Core/packages.config
src/Umbraco.Tests/packages.config
2017-02-08 09:14:27 +01:00
Shannon
f4f1f6774d
U4-9499 Update to latest Json.Net
2017-02-08 17:47:32 +11:00
Warren Buckley
ba6705a706
Merge branch 'dev-v7.6' into temp-U4-9314
2017-02-07 17:27:07 +00:00
Shannon
a71ec8dd81
Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6
2017-02-07 12:50:44 +11:00
Mikkel Holck Madsen
72aebd3ecf
Merge branch 'dev-v7' into temp-U4-9458
2017-02-06 21:44:26 +01:00
Shannon
72910cb35e
Updates everything to .Net 4.6.2, had to update the semver reference too - no breaking changes though
2017-02-07 00:22:34 +11:00
Sebastiaan Janssen
5a8e37f5b4
U4-9492 Update to latest ImageProcessor
2017-02-06 13:46:10 +01:00
Shannon
40ed77103f
Updates to latest 1.x version of log4net (before the real 2.x version) with binding redirects and codebase binding redirects to redirect from non-signed to signed version
2017-02-06 23:07:20 +11:00
Shannon
d598fdce54
Updates to latest Examine release
2017-02-03 12:03:56 +11:00
Mads Rasmussen
ab00ba8a12
Merge branch 'dev-v7.6' into temp-U4-9352
...
# Conflicts:
# src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
2017-01-27 10:39:31 +01:00
Sebastiaan Janssen
639d04381e
Bump version
2017-01-26 14:48:19 +01:00
Claus
29d86b8675
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6
2017-01-19 12:08:23 +01:00
Niels Hartvig
051af5c48e
Wire up the editors and controllers
2017-01-19 09:49:27 +01:00
Sebastiaan Janssen
54e460cf5b
U4-9392 Upgrade ImageProcessor with cache header and high CPU fix
...
U4-9393 Upgrade to Examine 0.1.80
2017-01-18 11:47:23 +01:00
Sebastiaan Janssen
b7d37af933
Bumps version
2017-01-16 11:04:28 +01:00
Shannon
cfd8d39878
Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6
...
# Conflicts:
# build/NuSpecs/UmbracoCms.nuspec
# src/Umbraco.Tests/Umbraco.Tests.csproj
2017-01-12 13:39:15 +11:00
Shannon
055ae0d126
updates latest IP mem leak fixes
2017-01-10 11:36:35 +11:00
Stephan
5e6f1a92ca
Merge branch origin/dev-v7 into dev-v7.6
2017-01-09 15:31:41 +01:00
Sebastiaan Janssen
770f96b6d5
Merge branch 'dev-v7' into dev-v7.6
...
# Conflicts:
# build/NuSpecs/UmbracoCms.Core.nuspec
2017-01-05 09:47:51 +01:00
Shannon
1df65bc3ce
Updates to latest ImageProcessor.Web to fix mime types when stored outside web root
2017-01-05 16:00:45 +11:00
Sebastiaan Janssen
dc62272e6e
Revert "Add Microsoft.IO.RecyclableMemoryStream to the nuspec, update to the latest version (1.2.1)"
...
Keep the version the same as what ImageProcessor relies on to avoid confusion and conflicts
This reverts commit 56d2230251
2017-01-03 17:04:38 +01:00
Sebastiaan Janssen
ccb8ac4cfc
Merge branch 'dev-v7' into U-9333
...
# Conflicts:
# src/Umbraco.Web.UI/packages.config
2017-01-03 14:19:43 +01:00
Claus
d866f1d74a
Merge branch 'dev-v7' into dev-v7.6
2017-01-03 11:58:23 +01:00
Sebastiaan Janssen
56d2230251
Add Microsoft.IO.RecyclableMemoryStream to the nuspec, update to the latest version (1.2.1)
2017-01-03 09:25:10 +01:00
Shannon
d412d90b17
fixing more IP assembly/nuget refs
2017-01-03 11:14:34 +11:00
Shannon
2f74181262
fixing more IP assembly/nuget refs
2017-01-03 11:06:15 +11:00
Shannon
4e2fb8e5dc
Fixes IP nuget references and fixes up several other Nuget assembly references.
2017-01-03 10:36:26 +11:00
Niels Hartvig
afbceca184
Makes EXIF data in resized images default
2017-01-02 17:29:37 +01:00
Shannon
b4ca04596c
U4-9319 Update to latest ImageProcessor v2.5.0 and ImageProcessor.Web v4.7.0
2016-12-28 19:21:00 +11:00
Shannon
5c40a1f9e9
bumps version
2016-12-19 16:42:05 +11:00
Stephan
a77763ee89
Merge origin/dev-v7 into dev-v7.6
2016-11-23 11:03:52 +01:00
Shannon
0e57d558f6
updates cdf version
2016-11-18 14:34:31 +01:00
Stephan
35aac2cdec
Merge origin/dev-v7 into dev-v7.6
2016-11-18 09:52:45 +01:00
Sebastiaan Janssen
0a883ae109
Make sure Umbraco runs in Visual Studio 2017
2016-11-16 18:55:12 +01:00
Stephan
ddf29c5875
Merge dev-v7.6 into dev-v7-deploy
2016-11-15 13:59:19 +01:00
Sebastiaan Janssen
26a04ca7e9
Merge pull request #1610 from umbraco/temp-U4-9134
...
U4-9134 XSS security issue in the grid
2016-11-15 12:56:21 +01:00
Sebastiaan Janssen
5b714572e3
Bump version
2016-11-14 17:04:55 +01:00
