yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,224 Commits 4 Branches 7 Tags
613dd76f810e5e19d4e35a8e30a6db86a4cf3072
Commit Graph

98 Commits

Author SHA1 Message Date
Shannon
e2d04e2b3a Merge branch '7.1.5' into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/less/modals.less
	src/Umbraco.Web/Mvc/AdminTokenAuthorizeAttribute.cs
 2014-08-24 21:35:08 -06:00
Jeavon Leopold
6b455aaa19 Add ImageProcessor httpmodule to web.template.config 2014-08-12 17:51:30 +01:00
antoine
00180d2120 Web.config with less mime 2014-05-13 16:19:45 +02:00
Aaron Powell
d369af5fe0 Specifying assembly for membership/user provider 
Addresses http://issues.umbraco.org/issue/U4-4781
 2014-04-29 21:49:56 +10:00
Shannon
e964d52548 Merge branch 'U4-898' of https://github.com/leekelleher/Umbraco-CMS into leekelleher-U4-898 2014-04-28 12:49:28 +10:00
Jwheuvel
44fbc29541 Update web.config with .woff mime support 
Bootstrap icons aren't visible on Windows Phone because it uses the .woff variant but the mimetype isn't available. Updated the web.config and added .woff to the staticContent section of system.webServer.
 2014-04-24 20:34:57 +02:00
Sebastiaan Janssen
670a67225a Upgrade to Json.Net 6.0.2 2014-04-08 11:37:40 +02:00
Sebastiaan Janssen
89efe40f41 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-04-01 14:27:47 +02:00
Sebastiaan Janssen
51660d918c Assembly redirect seems to help a lot installing NuGet pkg, should finally be able to close U4-4510 nuget targets file creates an invalid path in the property group 2014-04-01 14:22:13 +02:00
leekelleher
655d629621 Rebased web.Template.config - reapplied the whitespace fixes. 2014-03-28 16:31:03 +00:00
Sebastiaan Janssen
704c3df597 No more need for imageprocessor configs in web.config, yay! 2014-03-19 16:59:06 +01:00
Sebastiaan Janssen
527402a6d8 The Overflow starter kit adds App_Code and needs this reference to be able 
to use HttpResponseMessage
 2014-03-18 15:35:07 +01:00
Shannon
f168093b92 Merge commit 'f06c9e823545d8e86309bb751e63b99a2a3b1a18' into 7.1.0 
Conflicts:
	src/Umbraco.Core/Models/Member.cs
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Core/packages.config
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/passwordChanger.ascx.cs
 2014-02-18 18:03:29 +11:00
Shannon
f1a439e851 removes version specific references to mysql in the proj files and web.config 
ensures that escaping in the sql expression classes is done correctly without any double escaping. Also ensures that escaping is happening using the equals operator, not just the Equals() method and adds unit tests for them.
Fixes: U4-4232 Umbraco.Core.Persistence.Querying issue with backslashes
 2014-02-18 14:57:03 +11:00
perploug
2bd2f12831 ImageCropper Upload enabled 
The cropper can now fully replace the upload datatype
 2014-02-17 16:17:02 +01:00
Shannon
c4acbf0dbc Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Core/Configuration/ClientDependencyConfiguration.cs
	src/Umbraco.Core/Constants-Conventions.cs
	src/Umbraco.Core/Models/Member.cs
	src/Umbraco.Core/Models/Membership/IUser.cs
	src/Umbraco.Core/Models/Template.cs
	src/Umbraco.Core/Persistence/Factories/MemberReadOnlyFactory.cs
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
	src/Umbraco.Core/Persistence/RepositoryFactory.cs
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Core/Services/IMemberTypeService.cs
	src/Umbraco.Core/Services/IMembershipUserService.cs
	src/Umbraco.Core/Services/IUserService.cs
	src/Umbraco.Core/Services/MemberService.cs
	src/Umbraco.Core/Services/MemberTypeService.cs
	src/Umbraco.Core/Services/ServiceContext.cs
	src/Umbraco.Core/Services/UserService.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/MockTests.cs
	src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
	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/PartialViewMacros/Templates/LoginStatus.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Breadcrumb.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/EditProfile.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListAncestorsFromCurrentPage.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListChildPagesFromCurrentPage.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListChildPagesOrderedByDate.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListChildPagesOrderedByName.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListChildPagesWithDoctype.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListDescendantsFromCurrentPage.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Login.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/LoginStatus.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/MultinodeTree-picker.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Navigation.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/RegisterMember.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/SiteMap.cshtml
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.cs
	src/Umbraco.Web.UI/config/umbracoSettings.config
	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
	src/Umbraco.Web/Controllers/UmbLoginController.cs
	src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
	src/Umbraco.Web/Controllers/UmbProfileController.cs
	src/Umbraco.Web/Controllers/UmbRegisterController.cs
	src/Umbraco.Web/Models/LoginModel.cs
	src/Umbraco.Web/Models/LoginStatusModel.cs
	src/Umbraco.Web/Models/ProfileModel.cs
	src/Umbraco.Web/Models/RegisterModel.cs
	src/Umbraco.Web/Models/UmbracoProperty.cs
	src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
	src/Umbraco.Web/Security/WebSecurity.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoModule.cs
	src/Umbraco.Web/WebApi/UmbracoApiController.cs
	src/Umbraco.Web/umbraco.presentation/library.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewMacrosTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbracobase/baseLibrary.cs
	src/Umbraco.Web/umbraco.presentation/umbracobase/restExtension.cs
	src/umbraco.businesslogic/User.cs
	src/umbraco.providers/UsersMembershipProvider.cs
	src/umbraco.providers/members/UmbracoMembershipProvider.cs
 2014-02-13 16:22:51 +11:00
Shannon
30a73c0886 updated web.config template to use new role provider. 2014-02-13 14:45:24 +11:00
Shannon
2956aee4e3 Fixes: U4-4108 The backoffice should not be accessible when the app is not configured, it should redirect to the installer and U4-4106 Set the new membership providers to be shipped as default. 2014-01-22 15:26:45 +11:00
Sebastiaan Janssen
90174a39e3 Merge branch 'enkelmedia-patch-2' into 7.0.2 2013-12-29 12:41:12 +01:00
Sebastiaan Janssen
4d9f9c890d Merge branch 'patch-2' of https://github.com/enkelmedia/Umbraco-CMS into enkelmedia-patch-2 2013-12-29 12:40:46 +01:00
Shannon
8327b8aa0e Completes: U4-3792 Move appSettings, connectionStrings back to web.config 2013-12-06 11:52:47 +11:00
perploug
b6baa9af3d removes webdavModule from web.config 2013-12-04 09:24:04 +01:00
Shannon
b95575572d Merge remote-tracking branch 'origin/6.2.0-membershipprovider' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/Rdbms/UserDto.cs
	src/Umbraco.Core/NameValueCollectionExtensions.cs
	src/Umbraco.Core/Security/MembershipProviderBase.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Membership/MembershipProviderBaseTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Models/PasswordChangedModel.cs
	src/Umbraco.Web/Security/WebSecurity.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
	src/umbraco.cms/businesslogic/member/Member.cs
	src/umbraco.providers/Properties/AssemblyInfo.cs
	src/umbraco.providers/UsersMembershipProvider.cs
	src/umbraco.providers/members/MembersMembershipProvider.cs
 2013-10-18 11:33:38 +11:00
Shannon
a87e699f8d Updates the web.config template to allow password reset 2013-10-18 09:54:34 +11:00
Shannon
961928105c Moves connectionStrings to external file, now to figure out how to deal with both of these files with multiple devs 2013-10-04 10:53:22 +10:00
Shannon
c6229f131a Moves appSettings to external file and updates the code that modifies the app settings. 2013-10-04 10:34:00 +10:00
Shannon
1730005a58 Updates web.config template and transform for new dashboard section. 2013-10-03 17:54:10 +10:00
Shannon
63f5d0acaf Fixes: U4-2787 Copy dialog results in YSOD, converts move/copy dialog to only use the new API. removes xhtmlConformance from web.config. 2013-09-26 17:17:18 +10:00
Shannon
f5f25ed017 Completes: U4-2900 remove explicit declarations in web.config 2013-09-26 11:57:45 +10:00
Shannon
5ba1ad5e93 Completes: U4-2900 remove explicit declarations in web.config, U4-2940 Remove old spellchecker for now 2013-09-26 10:50:19 +10:00
Sebastiaan Janssen
d12b0b857e Update web.Template.config 2013-09-20 08:30:10 +02:00
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
enkelmedia
fdfb6187e9 Removing SVG from staticContent before addings it. 2013-09-01 16:51:00 +02:00
enkelmedia
69830f28c2 Added SVG as static content so SVG-icons in the backoffice will be served by IIS 2013-09-01 14:05:54 +02: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