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

198 Commits

Author SHA1 Message Date
Sebastiaan Janssen
3235678d29 U4-4510 nuget targets file creates an invalid path in the property group 
That should fix this one properly now
 2014-03-25 20:40:44 +01:00
Sebastiaan Janssen
14ea374b24 Also removing stray semicolons here for U4-4510 nuget targets file creates an invalid path in the property group 2014-03-24 15:44:09 +01:00
Sebastiaan Janssen
8391c32886 Fix whitespace 2014-03-24 09:34:48 +01:00
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
4f008f5848 Bump version to RC 2014-03-18 18:37:42 +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
4ad9ea1537 Bump the version to RC 2014-03-18 15:40:09 +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
perploug
fce31a2e02 7.1 beta 2014-03-07 15:26:28 +01:00
Sebastiaan Janssen
4d3eef1124 Update version 2014-03-07 15:25:10 +01:00
Sebastiaan Janssen
af376d2837 Fix failing nuget build (now that \install is removed) 2014-03-07 09:06:06 +01:00
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