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

65 Commits

Author SHA1 Message Date
Shannon
bd644bc707 Simplifies more of the interface config collection to reduce nesting. 2013-09-16 16:16:42 +10:00
Shannon
f38a6e1561 Makes some massive headway with the real config section, have got all code re-delegated to using it and have migrated the baserest config to the core project, all configs will be shared out of the UmbracoConfiguration singleton, now to get the unit tests all wired up and using mocks for the most part. 2013-09-13 18:11:20 +10:00
Shannon
36d82dc43b Created umbraco config holder object which is exposed on the application context, updated the web.config with the new section and the transform to ensure it get's added. 2013-09-13 14:06:36 +10:00
Shannon
70eb3e8613 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	.gitignore
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Tests/Models/DataValueSetterTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/RegisterMember.cshtml
	src/Umbraco.Web/Controllers/RegisterController.cs
	src/Umbraco.Web/Models/ProfileModel.cs
	src/Umbraco.Web/Models/RegisterModel.cs
	src/Umbraco.Web/Models/UmbracoProperty.cs
	src/Umbraco.Web/UmbracoModule.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
 2013-09-03 17:30:08 +10:00
Sebastiaan Janssen
4ef10c8afe Install a default member type during initial setup 2013-08-29 13:54:30 +02:00
Shannon
66c2157bea Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 
Conflicts:
	src/Umbraco.Core/UriExtensions.cs
	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Editors/MediaController.cs
	src/Umbraco.Web/Install/UmbracoInstallAuthorizeAttribute.cs
	src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
	src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs
	src/Umbraco.Web/Security/WebSecurity.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoContext.cs
	src/Umbraco.Web/UmbracoModule.cs
	src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs
	src/Umbraco.Web/WebApi/UmbracoApiController.cs
	src/Umbraco.Web/WebApi/UmbracoAuthorizeAttribute.cs
	src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.cs
 2013-07-31 18:52:14 +10:00
Sebastiaan Janssen
f50de5b049 U4-2550 Could not load file or assembly 'HtmlAgilityPack, Version=1.4.5.0 2013-07-26 15:16:55 +02:00
Shannon
deceec3fa2 Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/Membership/IUser.cs
	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/umbraco.businesslogic/packages.config
	src/umbraco.cms/Actions/ActionNew.cs
 2013-07-12 11:03:49 +10:00
Morten Christensen
0d54e8df89 Updating MySql package dependency 2013-07-03 11:00:26 +02:00
Shannon
68a648d3ba Merge remote-tracking branch 'origin/6.1.2' into 7.0.0 
Conflicts:
	.hgignore
 2013-06-25 10:01:23 +10: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
Shannon
5af8e86e3b updated web.config settings and default settings. 2013-06-24 13:37:25 +10:00
Stefan Kip
22cf59345c Removed space before UmbracoModule 
Removed space before UmbracoModule
Conflicts:
	src/Umbraco.Web.UI/web.Template.config
 2013-06-23 16:02:02 +02:00
Shannon
ed1aee5047 Implements: #U4-1770 - no more umbracoDebugMode, will use the compilation setting in the web.config 2013-06-21 16:20:18 +10:00
Shannon
816edce620 Implemented auto-mapper for mapping and converted over the user mappings. Got the gravatar directive working now too. Removed all umbracoUseMediumTrust settings. 2013-06-18 17:22:01 +10:00
Shannon
5719820fad Merge branch '6.0.7' into 6.1.2 
Conflicts:
	.gitignore
	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs
 2013-06-18 14:18:17 +10:00
Jayshoe
2cd07c841f Sitemap provider be gone! Issue #U4-1950 2013-06-12 16:19:14 +02:00
Sebastiaan Janssen
5c5d63ce9a web.Template.config formatting 2013-05-30 06:26:55 -02:00
Sebastiaan Janssen
d746ec6409 Merge with 6.0.6 2013-05-06 09:34:11 -02:00
Robert Stocks
4484f83caa Remove extra space in name of http module in web.config 2013-05-03 07:24:28 -01:00
Shannon Deminick
3fd1c49da7 Merge with 6.0.5 2013-04-29 12:09:36 -10:00
Shannon Deminick
f0e8252e38 Merge with 4.11.8 2013-04-29 12:09:12 -10:00
Shannon Deminick
ad06aded1b Removed strange old legacy config section that never did anything 2013-04-29 12:08:36 -10:00
Shannon Deminick
d2a285c120 Merge with 6.0.5 2013-04-25 19:43:03 -10:00
Shannon Deminick
d65bee76b2 Merge with 4.11.8 2013-04-25 14:15:09 -10:00
Shannon Deminick
46858af1ed Ensures user cookie is encrypted, removes ASP.Net headers from being returned in our response. Ensures 
that our auth cookie is httponly.
 2013-04-25 13:25:25 -10:00
Shannon Deminick
f8760b34b8 Merge with 6.0.1 2013-02-21 06:10:25 +06:00
Sebastiaan Janssen
bc824ba66a Updates for WebPI testers: Check if SQL CE file exists when connectionstring is 
filled in, make sure the connection string exists in web.config and if it has
empty values, run the installer instead of trying to start the site.
Also never claim the database is configure when the providername is empty.
 2013-02-20 15:55:39 -01:00
Morten Christensen
5d0aced9a7 Giving the install/upgrade a bit of TLC. 
Fixes U4-1520
 2013-01-28 14:01:38 -01:00
Sebastiaan Janssen
59c844eb8f Upgrade to MySQL connector 6.6.4.0 to fix U4-1519 2013-01-26 15:10:02 -01:00
Sebastiaan Janssen
7e460005da Added MySQL dataprovider in the wrong way, corrected now 2013-01-17 06:26:51 -01:00
Stephan
e7b84b1637 Merge with 6.0.1 2013-01-29 06:46:07 -01:00
Stephan
a699d9e1de merge from 6.0.1 2013-01-27 16:02:59 -01:00
Shannon Deminick
48202cfa09 Merge with 6.0.0 2013-01-23 18:50:44 +03:00
Sebastiaan Janssen
c103f93004 Possible fix for U4-1452 Umbraco 6 beta / MySQL: Unable to find the requested 
.Net Framework Data Provider.
 2013-01-15 14:19:31 -01:00
Sebastiaan Janssen
ac608f7b3e Keep umbracoDbDSN in the appSettings in the released version to prevent people 
from deleting it during merge.. it will delete itself after install anyway
 2013-01-10 12:05:03 -01:00
Sebastiaan Janssen
d6121ebab2 Connectionstrings section used to be after mailsettings, makes merges easier 
for people who are upgrading
 2013-01-09 05:15:28 -01:00
Shannon Deminick
97ffed5ee7 Changes the web.config template over to use the correct (non-obsoleted) examine classes. These have been obsolete for quite some time 
and no longer exist in the new UmbracoExamine codebase. This is a 'breaking' change however it only requres a config file update when upgrading.
 2013-01-05 22:48:45 +03:00
Sebastiaan Janssen
2b532f72c3 U4-1376 Remove redundant connectionstring 2012-12-31 12:15:46 -01:00
Morten Christensen
0cce4a1a9e Updating DefaultData and ContentControl to better support saving through the new api. 
DataTypes doesn't save directly to the db, but keeps the value in-memory so the save can be handled by the new api.
Correcting the usage of versioning in the ContentRepository.
 2012-12-14 11:43:16 -01:00
Morten Christensen
614ef15f8a Removing infrastructure setting, as its not needed any more 2012-12-11 08:00:06 -01:00
Sebastiaan Janssen
dc72907c33 Correcting indentation of xml file to VS default (tabs) 2012-12-10 11:51:04 -01:00
Shannon Deminick
5870452cc9 Updated assembly binding for MVC(4, and really any other MVC version that requires assembly binding if 
old libraries are built against old MVC versions).
Fixes a check for the ScriptingFile in for Partial View macros.
 2012-12-09 00:50:58 +05:00
Sebastiaan Janssen
323af078ca Upgrade to MVC4 2012-12-06 10:31:54 -01:00
Morten Christensen
d6c9f1f991 Reverting SolutionInfo. 
Updating DatabaseContext for installer although not fully working because of medium trust issue with refreshing connectionstrings.
 2012-11-27 10:05:26 -01:00
Morten Christensen
e32880f215 Final Merge with 4.11.0 2012-11-23 19:59:28 -01:00
Sebastiaan Janssen
e23ed30b0c Took out the temporary tree fixes and put another temp fix in (reverts to the 4.10.x code) 
Also removed dependency on ClientDependency.Mvc for now to make upgrades easier (no requirement to do assembly redirects in web.config)
 2012-11-23 11:45:51 -01:00
Morten Christensen
99820bf5e1 Merge with 4.11.0 2012-11-23 07:53:22 -01:00
Sebastiaan Janssen
61d99c4061 Of course we also need the assembly redirect for MVC2 -> 3 in the template config to start with (so the build.bat picks it up as well) 2012-11-22 15:45:14 -01:00
Morten Christensen
c5d86e9525 Merge with 4.10.0 2012-11-08 18:29:07 -01:00