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

128 Commits

Author SHA1 Message Date
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
Sebastiaan Janssen
0ca52fcc60 Fix merge issues, update version number 2013-04-29 12:29:15 -02:00
Shannon Deminick
d2a285c120 Merge with 6.0.5 2013-04-25 19:43:03 -10:00
Sebastiaan Janssen
8fae55e44e Correct path to Courier 2013-04-25 09:02:58 -02:00
Sebastiaan Janssen
a8ca3a89bd Forgot to uncomment some items 2013-04-25 08:51:31 -02:00
Sebastiaan Janssen
765f959f20 Reverting includes removal of courier/contour files 2013-04-25 08:44:37 -02:00
Sebastiaan Janssen
6ca6a08233 Add RevertToEmptyInstall which installs an empty DB with credentials admin/test 
Also deletes all dlls from /bin and rebuilds the project (to remove packages
that have installed dlls).
 2013-04-25 07:15:54 -02:00
Morten Christensen
c573459626 Fixing nuget related issue #U4-2067 and updating version 2013-04-22 06:01:31 -02:00
Morten Christensen
03c65c8eec Updating build version to 6.1.0 beta 
Updating nuspec with new references.
 2013-04-04 12:13:59 -02:00
Shannon Deminick
2c05eda899 Merge with 6.0.3 2013-03-07 04:01:04 +06:00
Morten Christensen
222a5237b0 Version updated to 6.0.3 2013-03-06 12:03:01 -01:00
Shannon Deminick
f1c680c7e2 Merge with 6.0.2 2013-03-02 02:50:17 +06:00
Shannon Deminick
36108df4d0 Merge with 6.0.2 2013-03-02 02:49:24 +06:00
Morten Christensen
cb03178d99 Updating version 2013-03-01 15:39:24 -01:00
Sebastiaan Janssen
0b4efe4eeb Merge with 4.11.5 2013-02-28 15:10:31 -01:00
Sebastiaan Janssen
c250fa560e Restrict the NuGet .Core dependency to the same version. 2013-02-28 15:08:30 -01:00
Sebastiaan Janssen
89ae3bc143 Add RevertToCleanInstall.bat to 4.11.5 too, it's handy. 2013-02-27 13:51:58 -01:00
Shannon Deminick
f8760b34b8 Merge with 6.0.1 2013-02-21 06:10:25 +06:00
Sebastiaan Janssen
d4fc82dae1 Calculate the hash of the WebPI package so it's not such a manual process. 2013-02-20 18:28:07 -01:00