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

83 Commits

Author SHA1 Message Date
Shannon
2e8993adb8 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	build/NuSpecs/build/net40/UmbracoCms.targets
	build/NuSpecs/build/net45/UmbracoCms.targets
	build/NuSpecs/build/net451/UmbracoCms.targets
	build/NuSpecs/tools/Readme.txt
	build/NuSpecs/tools/install.ps1
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
 2014-03-24 11:31:52 +11:00
Sebastiaan Janssen
006a89e136 U4-4498 Doc & Media Type, Server Error when upgrade, 7.0.4 to 7.1.0 RC via Nuget 
Have to copy in the Umbraco and Umbraco_Client folder during NuGet updates as well.
 2014-03-23 16:10:58 +01:00
Sebastiaan Janssen
424ff02734 Forgot a few includes, fixed! 2014-03-20 17:29:16 +01:00
Sebastiaan Janssen
80bd8d962b Make sure the App_Plugins folder is there 2014-03-20 16:58:35 +01:00
Sebastiaan Janssen
4b4efde490 Make sure the App_Plugins folder is there 2014-03-20 16:57:53 +01:00
Sebastiaan Janssen
956364decd v7 NuGet changes also apply to v6 2014-03-20 16:02:24 +01:00
Sebastiaan Janssen
c43ab7942a Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-20 15:38:52 +01:00
Morten Christensen
166f9b939c Moving the sqlce dlls to UmbracoFile in the nuspec 2014-03-20 15:37:41 +01:00
Morten Christensen
ede9e00a7f Updating the targets to include a few more folders 2014-03-20 15:37:21 +01:00
Sebastiaan Janssen
0bfbacfd66 No need to back up the config files, they don't get overwritten if you answer "No" 
Updated the readme.
 2014-03-20 15:33:41 +01:00
Sebastiaan Janssen
05ca98219d Also copy the new config files over 2014-03-20 14:57:07 +01:00
Sebastiaan Janssen
a83a0f1e25 Fix merge conflict 2014-03-20 14:27:39 +01:00
Sebastiaan Janssen
ea7d476559 Backup config files properly 2014-03-20 14:26:11 +01:00
Morten Christensen
bfaace373c Updating the install ps1 to only copy over the web.config on initial install to ensure that the web.config is correct. 2014-03-20 14:00:43 +01:00
Morten Christensen
a6d24fce93 Updating the targets files to copy in umbraco backoffice client dependencies AfterBuild with condition !Exists. 2014-03-20 14:00:42 +01:00
Sebastiaan Janssen
704c3df597 No more need for imageprocessor configs in web.config, yay! 2014-03-19 16:59:06 +01:00
Shannon
17893715fc Fixes the CDF nuget reference since we need the latest version and it is marked as visible now (this just undoes our old workaround) 2014-03-19 09:38:41 +11:00
Sebastiaan Janssen
4bcf3983c5 Update readme and remove non-functioning backups from install.ps1 2014-03-18 18:41:05 +01:00
Sebastiaan Janssen
7c5942b05f Updating minimum required versions of dependencies to be the same as v7. 2014-03-18 18:40:20 +01:00
Sebastiaan Janssen
8b4d4e3189 Update readme and remove non-functioning backups from install.ps1 2014-03-18 18:38:16 +01:00
Sebastiaan Janssen
1a40ccc838 Updating nuget targets files, like on v7. Also updates nuget author name. 2014-03-18 17:51:33 +01:00
Sebastiaan Janssen
0bf43da825 Time to finally update the author name as well 2014-03-18 17:49:53 +01:00
Sebastiaan Janssen
00e1556504 Update to the correct minimum requirements for ImageProcessor 2014-03-18 17:26:09 +01:00
Sebastiaan Janssen
3e86fb6298 ImageProcessor.Web only has a v3 for some reason 2014-03-18 15:54:10 +01:00
Sebastiaan Janssen
9b0895c5b0 People tend to forget to deploy global.asax A LOT, doesn't hurt to have it as content and 
included in the VS project, this should help a bit as it's no longer a hidden file
 2014-03-18 15:48:41 +01:00
Sebastiaan Janssen
0b08f19f53 U4-4174 Umbraco Nuget Install by Visual Studio 2013 failed 
Should be fixed by referencing this version of WebApi. ImageProcessor is also required
 2014-03-18 15:39:54 +01:00
Sebastiaan Janssen
9eea8c85e0 Include global.asax and Config\splashes folder while publishing with msdeploy 2014-03-18 15:32:39 +01:00
Sebastiaan Janssen
af376d2837 Fix failing nuget build (now that \install is removed) 2014-03-07 09:06:06 +01:00
Sebastiaan Janssen
d8aa98e60c Temporary workaround for the ClientDependency dependency 2014-01-13 11:50:13 +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
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
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
962bab088c Update nuspec files to get the correct dependencies with the correct versions 2013-09-27 12:00:36 +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
efe5de87a6 Updating readme for nuget packages 2013-08-22 12:58:53 +02:00
perploug
e825c08901 Added events.Service and xmlhelper.service 2013-08-12 15:17:34 +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