swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,362 Commits 73 Branches 219 Tags
a3576d8564a098f1de3a0bdfd9de555555ba09fe
Commit Graph

163 Commits

Author SHA1 Message Date
Shannon ab4c58b3a3 restores BuildBelle 2014-02-18 11:11:06 +11:00
Shannon 87f93be6ba updates version 2014-02-17 16:06:46 +11:00
Sebastiaan Janssen b3f6a8c71b Merge branch '7.0.3' into 7.1.0 
Conflicts:
	.gitignore
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
 2014-02-03 11:52:36 +01:00
Shannon 68b4a493c6 updates versions and port 2014-01-29 09:46:25 +11:00
Shannon b314bff127 Creates powershell file to do the build, this detects if you have sandcastle installed first, also overwrites the default TOC.css file with a custom slightly nicer version for the output. 2014-01-24 18:23:37 +11:00
Shannon d66e2e52e9 adds additional bat files to the sln files for editing, adds the sandcastle help file config file that can be used to build the docs when sandcastle is installed. 2014-01-24 16:31:49 +11:00
Sebastiaan Janssen 918e454c42 Make sure the build does a complete rebuild so that the Belle build gets triggered 2014-01-19 15:21:47 +01:00
Shannon 7e32fdb682 changed buildbelle to do a grunt build instead of running the default grunt build. 2014-01-19 13:11:23 +11:00
Sebastiaan Janssen 171a472966 Split out the Belle build and integrate it in the build of the Web.UI project 2014-01-17 18:56:04 +01:00
Sebastiaan Janssen 65b522a0a0 Automatically build Belle from build.bat without having to install Node.js on local machine 2014-01-17 14:52:42 +01:00
Sebastiaan Janssen d8aa98e60c Temporary workaround for the ClientDependency dependency 2014-01-13 11:50:13 +01:00
Shannon 63ca9f210b updates version # 2013-12-24 10:48:14 +11:00
Sebastiaan Janssen 208cf8a01d Bump version and try to make the buildserver happy 2013-12-09 17:55:37 +01:00
Shannon 478b7cde42 Removes uGoLive from the core (for now until it is rebuilt against v7 ) 2013-11-28 10:51:54 +11:00
Sebastiaan Janssen 3773cac232 Limit MVC and WebAPI to version 4 for now until we can test 5. 2013-11-21 08:53:40 +01:00
Sebastiaan Janssen 355137f982 U4-3469 Umbraco 7 + MVC 4 + nuget, web.config error 2013-11-19 15:12:47 +01:00
Sebastiaan Janssen 17db60c34a Fixes U4-3399 - Adds some nuget dependencies and we don't need the dummy in macroscripts 
any more nor do we need to preventatively delete json.net any more.
 2013-11-18 14:51:12 +01:00
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