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

146 Commits

Author SHA1 Message Date
Shannon
d0c5dd208f Reverted to Newtonsoft.Json 4.5.11 2013-11-13 11:28:14 +11:00
perploug
ea73ecd9cb merge 2013-11-05 11:44:34 +01:00
perploug
725ef52243 version comment in build 2013-11-05 11:17:04 +01:00
Sebastiaan Janssen
2617124ee8 Bump version to RC 2013-11-05 09:05:41 +01:00
Sebastiaan Janssen
a54b2297c7 Changed version to beta 2013-10-11 10:51:12 +02:00
Sebastiaan Janssen
a023ddb76b Fix json.net NuGet problem 2013-10-09 10:44:54 +02:00
Sebastiaan Janssen
f85f418d52 We need Json.Net v5+ 2013-10-08 20:41:54 +02:00
Sebastiaan Janssen
2fc8244f71 Fix NuGet package creation 2013-10-08 19:00:24 +02:00
Sebastiaan Janssen
df909983db Update NuGet Core dependency to AutoMapper 3+ 2013-10-07 08:37:33 +02:00
Shannon
6f6c33a721 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/NuSpecs/UmbracoCms.nuspec
	src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
	src/Umbraco.Core/Persistence/Relators/PropertyDataRelator.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Tests/BusinessLogic/BaseTest.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/TestHelpers/TestHelper.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
 2013-10-01 13:38:17 +10:00
Sebastiaan Janssen
5238293c09 Merge branch '6.1.6' into 6.2.0 
Conflicts:
	build/Build.bat
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
 2013-09-30 16:09:25 +02:00
Sebastiaan Janssen
226e35d65a NuSpec update: we can only accept a specific version of MySQL 2013-09-30 14:32:06 +02:00
Sebastiaan Janssen
abbf8aeb42 U4-2709 Error after upgrading from 6.1.3 to 6.1.4 2013-09-30 10:49:33 +02:00
Sebastiaan Janssen
328ada2f38 Bump version number 2013-09-30 10:46:08 +02:00
Sebastiaan Janssen
962bab088c Update nuspec files to get the correct dependencies with the correct versions 2013-09-27 12:00:36 +02:00
perploug
dcb08250ab Minor search visual tweaks 2013-09-27 11:23:38 +02:00
Sebastiaan Janssen
fbfdd8d398 Bump version number 2013-08-30 12:00:33 +02:00
Sebastiaan Janssen
8274883fa5 Bump version number to 6.2.0 2013-08-28 09:09:21 +02:00
Shannon
d257835cb5 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Models/ContentTests.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
 2013-08-28 11:08:23 +10:00
Morten Christensen
4337976887 Merge branch '6.1.4' of https://github.com/umbraco/Umbraco-CMS into 6.1.4 2013-08-22 12:59:08 +02:00
Morten Christensen
efe5de87a6 Updating readme for nuget packages 2013-08-22 12:58:53 +02:00
Sebastiaan Janssen
8cfb39ba2b Fix a strange VS2012 build targets problem 2013-08-20 18:08:34 +02:00
Sebastiaan Janssen
03a0a0a0e9 Fix a strange VS2012 build targets problem 2013-08-20 18:06:09 +02:00
Sebastiaan Janssen
9b70c0fbbf Fix wrong path and don't include index.html in build 2013-08-20 16:43:36 +02:00
Sebastiaan Janssen
e71fa681e6 Update build to v7 and include belle files 2013-08-20 14:18:02 +02:00
perploug
e825c08901 Added events.Service and xmlhelper.service 2013-08-12 15:17:34 +02:00
Sebastiaan Janssen
e41d3c7e84 Increase version to 6.1.4 2013-07-25 11:59:37 +02:00
Sebastiaan Janssen
a099af39c2 xmlrpcnet was missing from nuspecs 2013-07-25 11:50:56 +02:00
Lars-Erik Aabech
3900b7ebc8 Remove WebForms from nuspec file 
Not just WebForms anymore. :)
 2013-07-16 13:09:53 +02:00
Morten Christensen
e280785f48 Adding Msdeploy PropertyGroup to build prop file, so both FileSystem and MsDeploy package will include the umbraco and umbraco_client folders 2013-07-03 12:30:34 +02:00
Morten Christensen
30835797ff Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-03 11:47:09 +02:00
Morten Christensen
aed70ae40c Updating dependencies in our own nuspec file 2013-07-03 11:46:53 +02:00
Jesper Hauge
7a398d34b1 Added file-reg to .nuspec 2013-07-03 11:33:05 +02:00
Jesper Hauge
c9065d96a9 These files will add MSBuild target that copies /umbraco /umbraco_client and /App_Browsers files to .csproj files, during install of NuGet package UmbracoCms 
Functionality has been tested by creating af copy of the current Nuget package and add these files to the package, then using this package on a new Web application project. Building and doing a VS Publish to the filesystem.
 2013-07-03 11:17:47 +02:00
Sebastiaan Janssen
ffce1a3e6b Open new branch for 6.1.3 2013-06-28 14:44:56 +02:00
Sebastiaan Janssen
e553f2c671 Correct little mistake in nuspec file 2013-06-28 14:21:25 +02:00
Morten Christensen
4368f15097 Updating nuspec files which is a bit different for 6.1.x then 6.0.x 2013-06-27 15:36:25 +02:00
Morten Christensen
b90150279b Merge branch '6.0.7' into 6.1.2 
Conflicts:
	build/Build.proj
	build/NuSpecs/UmbracoCms.Core.nuspec
	src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
 2013-06-27 15:27:31 +02:00
Morten Christensen
5c09ba9a2d Updating nuspec files and build 2013-06-27 15:15:27 +02:00
Sebastiaan Janssen
bd77463fa4 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	build/NuSpecs/UmbracoCms.Core.nuspec
	src/Umbraco.Core/Models/ContentTypeBase.cs
	src/Umbraco.Core/Models/IContentTypeBase.cs
	src/Umbraco.Core/Models/PropertyGroupCollection.cs
 2013-06-24 12:06:58 +02:00
Sebastiaan Janssen
368954226a Update to not require specific version of MVC4, just 4.0.20710.0 and higher 2013-06-24 12:05:22 +02:00
Sebastiaan Janssen
09d9728fb8 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2013-06-23 15:16:44 +02:00
Sebastiaan Janssen
c0df3e0202 Match IIS Express port number to Umbraco version so it's easier to use a few copies of the repo locally 
(you don't have to re-map your port to the correct folder)
 2013-06-23 15:13:27 +02:00
Sebastiaan Janssen
d8a8bf5f74 Bump version number 2013-05-30 10:26:40 -02:00
Sebastiaan Janssen
a8ad8c2a43 Bump version number 2013-05-30 10:23:35 -02:00
Sebastiaan Janssen
ae9d77a765 Bump version number 2013-05-29 05:40:55 -02:00
Sebastiaan Janssen
2f61bc27c8 Bump version number 2013-05-28 15:15:32 -02:00
Sebastiaan Janssen
3b05663597 Add MiniProfiler as a requirement for the NuGet package 2013-05-10 10:55:28 -02:00
Sebastiaan Janssen
d10eff04a7 Update version 2013-05-10 07:09:43 -02:00
Sebastiaan Janssen
64bbfb8cbc Merge with 6.0.5 2013-04-29 12:31:13 -02:00