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

334 Commits

Author SHA1 Message Date
Shannon
2c918a2015 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2015-03-24 15:10:45 +11:00
Sebastiaan Janssen
907e5e7ca4 Bump version 2015-03-20 11:25:59 +01:00
Sebastiaan Janssen
8c4eba7837 "It's simple until you make it complicated" 
- So now this logic has been un-complicated: look for the web.config file, if it exists and has a umbracoConfigurationStatus appSetting then don't overwrite the web.config, the user is upgrading umbraco and config transforms can do their thing. Otherwise, copy in a fresh web.config with all the required Umbraco bits.
 2015-03-20 10:16:53 +01:00
Shannon
182d671e31 Merge branch 'dev-v7' into 7.3.0 2015-03-20 16:42:34 +11:00
Shannon
fff0151b62 Updates build process to: Ensure the AssemblyFileVersion is set to the real umbraco version, AssemblyInformationalVersion is set to the real umbraco version including the pre-release name if there is one, AssemblyCopyright has the correct year. 2015-03-20 09:31:14 +11:00
Shannon
f15301a7a0 Merge remote-tracking branch 'origin/dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2015-03-20 08:26:16 +11:00
Sebastiaan Janssen
90fdbb007e Bump version 2015-03-19 14:45:00 +01:00
Sebastiaan Janssen
311d503d8b Updates CDF dependency to latest version 2015-03-19 12:54:00 +01:00
Shannon
d3eff734aa Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/CoreBootManager.cs
	src/Umbraco.Core/Models/Template.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/PropertyEditors/ParameterEditorResolver.cs
	src/Umbraco.Core/PropertyEditors/PropertyEditorResolver.cs
	src/Umbraco.Core/Services/LocalizedTextService.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Plugins/TypeFinderTests.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/Umbraco.Web/Models/ContentExtensions.cs
	src/Umbraco.Web/PublishedContentExtensions.cs
	src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
	src/Umbraco.Web/Scheduling/Scheduler.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-03-19 17:37:00 +11:00
Sebastiaan Janssen
4e9667a067 Don't forcibly remove System.Web.Helpers.dll during upgrades in case people have it already and packages rely on it 2015-03-18 09:49:18 +01:00
Sebastiaan Janssen
97a085d12b Bump version 2015-03-03 20:19:41 +01:00
Sebastiaan Janssen
74d0ec949d Delete bower_components folder before build else missing packages will sometimes not be downloaded 2015-03-03 19:43:19 +01:00
Sebastiaan Janssen
6f2fa2ed4d Makes sure that the version comment gets cleared when there is no comment. 2015-02-26 12:38:03 +01:00
Shannon
0ae1453fb1 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/umbraco.cms/businesslogic/Dictionary.cs
 2015-02-23 13:18:01 +01:00
Sebastiaan Janssen
b724a185b7 Pushes the ascii art down one line as it looked a bit weird because the cursor is on the first line by default after installing 2015-02-19 09:37:56 +01:00
Sebastiaan Janssen
f94d280e27 Removes unnecessary dummy files. Some directories are old and not needed, plus they all get created on app startup anyway. 2015-02-19 09:23:07 +01:00
Shannon
428df7ae4a Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-02-17 15:11:10 +01:00
Sebastiaan Janssen
25cfceadc0 Merge branch 'dev-v7-upgradablemvc5webapi2' of https://github.com/Shazwazza/Umbraco-CMS into Shazwazza-dev-v7-upgradablemvc5webapi2 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
 2015-02-17 10:46:36 +01:00
Sebastiaan Janssen
7788452fb7 U4-6219 Visual Studio 2013 Crashes When Opening umbraco.sln 
#U4-6219 Fixed
 2015-02-13 10:04:35 +01:00
Shannon
c7778467e3 Updates to latest examine version which internally supports tokenized paths in config so we don't need to do this in the umbraco core. 2015-02-13 15:34:54 +11:00
Sebastiaan Janssen
58b8aacff1 Fixes U4-6052 Umbraco 7.2.1 web app installed with Nuget fails at start with error :"Cannot create an MVC Area path without the umbracoPath specified" 
#U4-6052 Fixed Due in version 7.2.2
 2015-02-10 17:38:19 +01:00
Stephan
470ccd1ffc Merge branch 'dev-v7' into 7.3.0 2015-02-09 08:59:23 +01:00
Sebastiaan Janssen
4790dc59a9 Update CDF dependency 2015-02-05 09:01:42 +01:00
Stephan
6d08d9b7b0 Merge branch 'dev-v7' into 7.3.0 2015-02-03 20:08:46 +01:00
Shannon
ba54f96efd updates nuspec 2015-02-03 13:16:30 +11:00
Shannon
5d7902a9a7 Merge remote-tracking branch 'origin/dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/PartialViewMacroRepository.cs
	src/Umbraco.Core/Umbraco.Core.csproj
 2015-01-14 09:10:11 +11:00
Sebastiaan Janssen
4c5cc93a67 U4-6052 Umbraco 7.2.1 web app installed with Nuget fails at start with error :"Cannot create an MVC Area path without the umbracoPath specified" 
#U4-6052 In Progress
 2015-01-07 11:28:23 +01:00
Shannon
341239648d bumps version 2015-01-07 09:17:22 +11:00
Shannon
ec5ca9087e Removes all references of Microsoft.Web.Helpers - we don't need to ship this, we don't reference it and it has compatibility problems. Also updates the version to 7.3.0 2015-01-06 18:24:27 +11:00
Shannon
4a72e8c3df Creates ReflectedFixedRazorViewEngine and version checkers to dynamically update code depending on the major versions of MVC and WebApi 2015-01-06 17:40:28 +11:00
Shannon
fff1da2a12 Merge branch 'dev-v7' into 7.3.0 2015-01-02 16:25:52 +11:00
Shannon
8c619e92d9 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2014-12-29 14:30:01 +11:00
Morten Christensen
71244b9bcd Smaller variation so text isn't pushed down 2014-12-17 16:17:49 +01:00
Morten Christensen
fd1e369b2a Makes readme.txt for nuget packages awesome! 2014-12-17 15:59:37 +01:00
Shannon
ff66c90855 doh, fixed nuspec, there's no mvc cdf 1.8.1. updates the port 2014-12-11 18:49:40 +11:00
Shannon
082d116924 updates nuspec with examine and cdf updates 2014-12-11 17:46:06 +11:00
Shannon
78bee017ca Updates nuspec to have a min examine version of 0.1.58 and prettifies their structure. 2014-12-09 19:10:57 +11:00
Shannon
451be273a5 bump version 2014-12-09 18:55:54 +11:00
Shannon
d4fd58e038 Completes: U4-5846 Remove cmsTemplate.master column and transfer those values over to umbracoNode.parentId, U4-5847 Ensure the path is set correctly for templates in the db, almost done the other template service tasks too. 2014-12-05 17:29:47 +11:00
Sebastiaan Janssen
2f79d4a71d Better replacement of examine management ascx to html 2014-12-03 11:27:02 +01:00
Sebastiaan Janssen
c563629756 Bump version 2014-12-03 10:25:08 +01:00
Sebastiaan Janssen
acb3ecbbf7 Updates NuGet Readme 2014-12-03 09:57:22 +01:00
Sebastiaan Janssen
d4db32c0f2 Don't ship with or require dotLess install 2014-12-02 11:44:15 +01:00
Sebastiaan Janssen
6b92e47631 Unfortunately, we HAVE to point to MVC 4.0.0.0 else you get YSODs on machines with 4.0.0.1 in the GAC (and we can't point to 4.0.0.1 because 4.0.0.0 might be in the GAC and then it'll YSOD for THOSE people). BOOOO 2014-12-01 10:57:24 +01:00
Sebastiaan Janssen
0155a094b1 Bump Version 2014-11-27 12:12:31 +01:00
Sebastiaan Janssen
a1c223bc2b Revert to using MVC 4.0.0.0 OOB so that people who have only 4.0.0.0 in the GAC can actually install Umbraco. If 4.0.0.1 is in the GAC that version will be taken. 
Leaves the additional reference to System.Web.Http in web.config so that you don't get the System.Web.Http.ApiController when 4.0.0.1 is indeed in the GAC.
 2014-11-26 10:43:46 +01:00
Sebastiaan Janssen
2a66f95873 #U4-5453 Fixed 
#U4-5871
Enabling IIS Compression gives ERR_CONTENT_DECODING_FAILED in backoffice
 2014-11-25 18:22:27 +01:00
Sebastiaan Janssen
a1a1b9ebb5 Merge branch '7.1.9' into 7.2.0 2014-11-15 14:19:51 +01:00
Sebastiaan Janssen
403f64eeed Only set comment to blank if there's command line arguments 2014-11-15 14:19:26 +01:00
Sebastiaan Janssen
5a26a52157 Merge branch '7.1.9' into 7.2.0 
Conflicts:
	build/Build.bat
	build/UmbracoVersion.txt
 2014-11-15 14:18:34 +01:00