yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,343 Commits 4 Branches 7 Tags
bfd201efcc587f4e30cdebea9d22e4bbbecabe9d
Commit Graph

355 Commits

Author SHA1 Message Date
Shannon
2ae236e98d Adds xml transform for partial view tree types 2017-03-23 18:48:41 +11:00
Shannon Deminick
04d37c590b Merge pull request #1786 from umbraco/temp-U4-9004 
U4-9004 Remove URLRewriting.net dependency
 2017-03-14 16:25:41 +11:00
Shannon
df04100ff6 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Persistence/Querying/ExpressionVisitorBase.cs
#	src/Umbraco.Core/Persistence/Querying/SqlExpressionExtensions.cs
#	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/MediaService.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Web.UI.Client/src/less/tree.less
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Editors/MediaController.cs
 2017-03-10 10:40:28 +01:00
Sebastiaan Janssen
13aa615745 U4-9004 Remove URLRewriting.net dependency 2017-03-09 11:41:36 +01:00
Stephan
d1111009e3 Fix SemVer lib version 2017-03-08 18:45:00 +01:00
Claus
9f6e4d4fd5 updating nuspec. 2017-03-08 12:04:48 +01:00
James Coxhead
9acfd8f5d2 Updated dashboard config transform 
Fix for dupicate dashboards after upgrading
 2017-03-02 21:02:25 +00:00
Shannon
f30d7fc68c Fixes nuspec to be net45 as a min 2017-02-14 14:29:23 +11:00
Shannon
ce0821e2d6 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Tests/Umbraco.Tests.csproj
 2017-02-09 13:20:33 +11:00
Sebastiaan Janssen
311edd3279 Adds missing dependency (it's in dev-v7, must have been a merge where it was forgotten to be merged into dev-v7.6) 2017-02-08 10:36:36 +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
Sebastiaan Janssen
73e219b23c Fix unit tests 2017-02-07 16:24:34 +01:00
Sebastiaan Janssen
389b29599b U4-9495 ImageProcessor high CPU usage when trimCache=true 2017-02-07 10:29:11 +01:00
Shannon
a71ec8dd81 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 2017-02-07 12:50:44 +11:00
Shannon
a6c2844d12 updates nuspec with correctly targeted framework 2017-02-07 01:03:50 +11: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
Shannon
7be30ad6ac Moves all binding redirects via code to one place 2017-02-06 23:46:44 +11:00
Sebastiaan Janssen
5a8e37f5b4 U4-9492 Update to latest ImageProcessor 2017-02-06 13:46:10 +01:00
Shannon
f87ccc0a53 Updates nuspec 2017-02-06 23:36:56 +11:00
Claus
29d86b8675 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 2017-01-19 12:08:23 +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
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
Sebastiaan Janssen
358dd7f32b Move ImageProcessor.Web.Config to not be in the .Core NuGet, it's not a dll 2017-01-10 07:30:35 +01:00
Shannon
d11e787624 updates Nuspec with IP version 2017-01-10 11:37:31 +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
c2359a96f8 missed nuspec update 2017-01-05 17:09:37 +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.

# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
 2017-01-03 17:04:38 +01:00
Sebastiaan Janssen
6a374cbfa6 Make the NuGet install and upgrade work 2017-01-03 15:57:21 +01:00
Claus
d866f1d74a Merge branch 'dev-v7' into dev-v7.6 2017-01-03 11:58:23 +01:00
Sebastiaan Janssen
84c0682f16 Not necessary to install Microsoft.IO.RecyclableMemoryStream, the ImageProcessor dependency will do that for us 2017-01-03 10:20:22 +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
Sebastiaan Janssen
62f21d3cee Update nuspec to install latest version of ImageProcessor 2017-01-03 09:17:05 +01:00
Shannon
59f39fd535 Ensures we remove the new DLL with the install script like other files 2016-12-28 19:48:35 +11:00
Stephan
a77763ee89 Merge origin/dev-v7 into dev-v7.6 2016-11-23 11:03:52 +01:00
Sebastiaan Janssen
64978dbe89 Merge pull request #1560 from mikkelhm/dev-v7 
U4-9209 - Updates web.config.install.xdt to re-add the assemblyBinding for Html…
 2016-11-21 22:54:49 +01:00
Sebastiaan Janssen
77e9643a09 Update NuGet CDF dependency 2016-11-21 08:17:18 +01:00
Stephan
8fa1499a2f Merge origin/dev-v7 into dev-v7-deploy 2016-11-04 12:18:39 +01:00
mikkelhm
e9724c8785 Updates web.config.install.xdt to re-add the assemblyBinding for HtmlAgilityPack after removing it earlier 2016-10-30 20:46:18 +01:00
Stephan
e330d40005 U4-9090 - Upgrade to ModelsBuilder 3.0.5 (reuse compiled live dll on restart) 2016-10-25 12:40:27 +02:00
Stephan
e8538cc035 Merge remote-tracking branch 'origin/dev-v7' into dev-v7-deploy 2016-10-20 12:23:22 +02:00
Stephan
20fc78419e Refactor / fix SignalR integration, add nuspec dependency 2016-10-19 15:07:48 +02:00
Sebastiaan Janssen
097f5355e2 U4-9050 Update to latest Examine 0.1.70.0 2016-10-18 18:03:43 +02:00
Sebastiaan Janssen
7b5670f275 U4-9076 Update to latest ImageProcessor 2016-10-18 16:45:16 +02:00
Stephan
3fd918d381 Refacetor BackgroundTaskRunner, fix async issues 2016-10-04 14:12:06 +02:00
Sebastiaan Janssen
b8aaebf51a Fix automapper remove/insert transform 2016-09-28 16:05:35 +02:00
Shannon
248177f518 Ensures Nuspec has correct AutoMapper, ensures config transform is correct (we cannot remove something that isn't there since it never existed before) 2016-09-28 15:33:32 +02:00
Claus
c9106065fd config transform for nuget upgrade. 2016-09-20 09:12:44 +02:00