Commit Graph

650 Commits

Author SHA1 Message Date
Sebastiaan Janssen
0e67c787a8 Bump version to RC :) 2017-04-04 08:05:32 +02:00
Shannon
ebfb2b536f bumps version to RC01 2017-04-04 13:12:03 +10: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
Emil Wangaa
d51082f651 Bumps version 2017-03-30 10:27:54 +02:00
Stephan
95508c4fb7 Upgrade nuspec accordingly 2017-03-30 09:32:22 +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
25f5179b29 updates nuspec 2017-03-30 16:36:54 +11:00
Shannon
7cdb48b6c9 bumps version 2017-03-29 16:35:37 +11:00
Shannon Deminick
a667058422 Merge pull request #1828 from umbraco/temp-u4-9655
U4-9655 - update HtmlAgilityPack version in config
2017-03-29 16:33:37 +11:00
Stephan
a2a9794fdb U4-9655 - update HtmlAgilityPack version in config 2017-03-24 14:47:27 +01:00
mikkelhm
bfd201efcc Bump version to 7.6-Beta5 2017-03-23 15:46:18 +01:00
Shannon
2ae236e98d Adds xml transform for partial view tree types 2017-03-23 18:48:41 +11:00
Emil Wangaa
1e154e8bc9 Internal Beta04 version bump - needed for Forms 2017-03-22 14:32:35 +01:00
Warren Buckley
7b1efa718e Internal Beta03 version bump - needed for Forms for access to [FileUploadCleanupFilter] 2017-03-21 15:50:13 +00:00
Warren Buckley
ac496b0cf6 Updates version to beta02 - after Warren forgot to merge & push AccessToInternals for Forms before public beta 2017-03-20 15:40:15 +00:00
Sebastiaan Janssen
c79aaa9c48 Bumps version 2017-03-17 11:49:42 +01: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
6992b0319a Version 7.6-alpha074 2017-03-08 18:59:27 +01:00
Stephan
d1111009e3 Fix SemVer lib version 2017-03-08 18:45:00 +01:00
Warren Buckley
a3f6fb78f5 Bump version to alpha-73 after downgrade to .NET 4.5 2017-03-08 12:22:47 +00:00
Claus
9f6e4d4fd5 updating nuspec. 2017-03-08 12:04:48 +01:00
Warren Buckley
5218d31f23 Bumps version to alpha-072 2017-03-07 15:43:29 +00:00
James Coxhead
9acfd8f5d2 Updated dashboard config transform
Fix for dupicate dashboards after upgrading
2017-03-02 21:02:25 +00:00
mikkelhm
589704437f Bump version to alpha071 2017-03-02 15:46:06 +01:00
mikkelhm
32ad98cde2 Bump version to alpha070 2017-03-02 13:33:12 +01:00
mikkelhm
a39557a3a7 Bump version to alpha068 2017-02-24 12:31:59 +01:00
Sebastiaan Janssen
0b9a3ef68a Bump version 2017-02-22 10:26:37 +01:00
Stephan
f61b7579a2 Version 7.6-alpha066 2017-02-21 17:13:34 +01:00
Sebastiaan Janssen
52dce66598 Bump version 2017-02-21 08:49:34 +01:00
Stephan
fed06c88e8 Version 7.6-alpha065 2017-02-17 14:28:26 +01:00
Claus
33d35fd9f7 bumping version just to be sure. 2017-02-16 10:01:37 +01:00
Stephan
0074f57970 Version 7.6-alpha063 2017-02-14 11:23:20 +01:00
Shannon
f30d7fc68c Fixes nuspec to be net45 as a min 2017-02-14 14:29:23 +11:00
Claus
771f8d92f2 adding in missing extension method stuff for some udis. 2017-02-10 14:44:56 +01: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
f3b364022a bumping version for deploy. 2017-01-31 10:33:57 +01:00