95a4bb9ba6
refactor PublishedContentModelFactory
2014-05-19 13:15:47 +02:00
62d4bff8aa
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
...
Conflicts:
src/Umbraco.Web.UI/config/ClientDependency.config
2014-03-13 11:11:51 +11:00
0dc00a62e2
Adds ability to have proxy migrations so there is no duplication of declaring migrations and no duplication of executing already executed migrations. Would have been a bit nicer to have
2014-03-12 20:36:40 +11:00
9d7d866467
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
...
Conflicts:
src/Umbraco.Core/CoreBootManager.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AdditionalIndexesAndKeys.cs
src/Umbraco.Core/Umbraco.Core.csproj
2014-03-12 18:44:54 +11:00
d0fc3ddba5
ensures applicationeventsresolver is disposed of in the correct place.
2014-03-12 18:11:05 +11:00
6a4ea56dc5
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
...
Conflicts:
src/Umbraco.Core/CoreBootManager.cs
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AdditionalIndexesAndKeys.cs
2014-03-12 17:17:05 +11:00
ff21379547
Makes ApplicationEventsResolver IDisposable so we can clear resources after startup.
2014-03-12 14:16:52 +11:00
2ecab70772
Fixes: U4-4182 Exception during plugins loading
2014-03-11 17:00:35 +11:00
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
690d08aa8c
Completes wrapping the new IUserService from the legacy User object. Ensures User cache is handled correctly and distributed cache is updated for Users.
2014-01-28 10:46:59 +11:00
743c0bb31c
Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0
2013-12-16 14:19:10 +11:00
a42b660648
Backporting the cachehelper and associated cache classes.
2013-12-16 13:19:10 +11:00
98c8d637f4
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
...
Conflicts:
src/Umbraco.Core/DatabaseContext.cs
src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/umbraco.presentation/install/utills/LegacyClasses.cs
2013-12-13 13:05:10 +01:00
5aec753859
U4-3710, -3732 - Fix default ShortStringHelper
2013-12-13 12:20:57 +01:00
49550b410a
Ensures Integer and Email validators are added on startup as manifest validators.
2013-12-12 18:28:45 +11:00
478b7cde42
Removes uGoLive from the core (for now until it is rebuilt against v7 )
2013-11-28 10:51:54 +11:00
46ba9718ff
Changes the explicit paramet editor implementations to simply use the already created property editors, updates the legacy parameter editor mappings and adjusts the resolver to use the mappings if one is not found.
2013-10-30 14:36:07 +11:00
ee5af4998f
Fix bug after merge
2013-10-11 12:30:17 +02:00
4b36dcc13b
Fix bug after merge
2013-10-11 12:28:31 +02:00
69367e0cda
Merge remote-tracking branch 'origin/6.2.0-pubcontent' into 7.0.0-pubcontent
...
Conflicts:
src/Umbraco.Core/Models/DataTypeDefinition.cs
src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
src/Umbraco.Core/Properties/AssemblyInfo.cs
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
src/umbraco.providers/members/MembersMembershipProvider.cs
2013-10-11 10:24:24 +02:00
671b94dd06
PublishedContentModel - keep it internal for now
2013-10-11 09:24:26 +02:00
19784e04bf
Merge remote-tracking branch 'origin/6.2.0-pubcontent' into 7.0.0-pubcontent
...
Conflicts:
src/Umbraco.Core/ObjectResolution/Resolution.cs
2013-10-02 17:42:59 +02:00
06206c60d9
Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent
2013-10-02 17:06:46 +02:00
f64b8d680d
Core.StringExtensions - switch over to the new DefaultShortStringHelper
2013-10-02 16:54:56 +02:00
3ca8b356ee
Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent
...
Conflicts:
src/Umbraco.Core/Cache/CacheProviderBase.cs
src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
src/Umbraco.Core/Cache/NullCacheProvider.cs
src/Umbraco.Core/Cache/StaticCacheProvider.cs
src/Umbraco.Core/Configuration/UmbracoSettings.cs
src/Umbraco.Core/CoreBootManager.cs
src/Umbraco.Core/Dynamics/PropertyResult.cs
src/Umbraco.Core/Models/IPublishedContentProperty.cs
src/Umbraco.Core/Models/PublishedItemType.cs
src/Umbraco.Core/PropertyEditors/IPropertyEditorValueConverter.cs
src/Umbraco.Core/PropertyEditors/PropertyEditorValueConvertersResolver.cs
src/Umbraco.Core/PropertyEditors/PropertyValueConvertersResolver.cs
src/Umbraco.Core/PublishedContentExtensions.cs
src/Umbraco.Core/PublishedContentHelper.cs
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Tests/CodeFirst/StronglyTypedMapperTest.cs
src/Umbraco.Tests/LibraryTests.cs
src/Umbraco.Tests/PropertyEditors/PropertyEditorValueConverterTests.cs
src/Umbraco.Tests/PublishedCache/PublishedContentCacheTests.cs
src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
src/Umbraco.Web/ExamineExtensions.cs
src/Umbraco.Web/Models/DynamicPublishedContent.cs
src/Umbraco.Web/Models/XmlPublishedContent.cs
src/Umbraco.Web/Models/XmlPublishedContentProperty.cs
src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
src/Umbraco.Web/PublishedContentExtensions.cs
src/Umbraco.Web/Templates/TemplateUtilities.cs
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/WebBootManager.cs
src/Umbraco.Web/umbraco.presentation/macro.cs
src/umbraco.MacroEngines/RazorDynamicNode/PropertyResult.cs
src/umbraco.MacroEngines/RazorDynamicNode/PublishedContentExtensions.cs
2013-09-23 21:57:22 +02:00
d925f856ae
Take care of FIXMEs
2013-09-23 16:55:59 +02:00
3de2196e01
PublishedContent - reorg. existing IPropertyValueConverter impl.
2013-09-23 16:42:35 +02:00
c0a303b328
Gets macro editor working with new db changes and using new MacroService data layer
2013-09-19 17:34:57 +10:00
08566f32de
Take care of more FIXMEs
2013-09-18 10:09:05 +02:00
85cb7fadfc
PublishedContent - implement a model factory
2013-09-16 17:17:48 +02:00
0415a31d0e
PublishedContent - the big refactoring
2013-09-16 17:17:45 +02:00
719b921e0b
Created the maps for all core property editors to map from legacy GUID to new alias with unit tests.
2013-09-09 15:57:22 +10:00
26a47e7ee1
Updated the published conversion process with the new PropertyValueConverter and migrated the old core IPropertyEditorValueConverters to the new format.
2013-09-09 15:17:33 +10:00
cb368b4335
Implemented the numeric property editor
2013-08-28 13:30:05 +10:00
3708b0de65
Got value editors being able to handle 'object' not just string so we can post and return json structures directly to the angular editors, got the multiple drop down list working and saving data. U4-2704 Change property editor value editor to return/receive object instead of string
2013-08-26 18:03:35 +10:00
75ceb539b4
Streamlines cache helper ctor's
2013-08-09 11:37:57 +10:00
4b8fed9f06
Started converting content model mapping over to use AutoMapper to fix the composite tabs/properties. New unit tests for the mapping as well.
2013-07-25 15:31:26 +10:00
3779e79367
Changes over SectionCollection to SectionService, ApplicationTreeCollection to ApplicationTreeService. Starts implementing UserSectionRepository for use with SectionService. Streamlines BaseMapper implementations.
2013-07-02 17:47:20 +10:00
388f55d7fd
Moved application logic into Core which are now 'Sections'. Have proxied all calls from the legacy application to sections. Streamlined how automapper configs are registered (much better now). Updated some unit tests to use the new classes instead of the legacy ones. Created the sections controller to return the sections from the back office. Changed the TypeFinder to search all types not just public ones, changed the boot managers to not have to explicitly modify the resolvers with internal types because now internal types are automatically found.
2013-07-01 14:23:56 +10:00
24111c52f2
Obsoleted umbraco.businesslogic.ApplicationTree, have moved logic and new classes to core and proxied calls from it to the new ones. The new ApplicationTreeCollection will be the runtime colleciton of trees which can also read/write/save to the xml.
2013-06-20 10:05:51 +10:00
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
0f5d61bae8
Started importing classes and functionality from the Belle project so we can start wiring up data.
2013-05-23 22:15:52 -10:00
f26e39f5ce
Adding a new extensibility in relation to #U4-2244 which allows consumers of the CoreBootManager to explicitly set the path to the root of an umbraco site/solution.
...
A bit of cleanup in the IOHelper class.
2013-05-22 07:48:42 -02:00
2f16e6662d
updates disposable timer to ensure it also outputs to HttpTrace if there is one.
2013-05-14 13:39:55 -10:00
5890fe1849
Upgraded DisposableTimer to wrap the profiler... now we should really just use DisposableTimer for all profiling.
2013-05-13 21:11:03 -10:00
b6f52bf782
Changed the profiler over to use resolvers again. We no longer will call MiniProfiler directly.
...
Added an HtmlHelper extension which is used to render the profiler html output.
Added an HtmlHelper property to the new base page too.
2013-05-13 20:10:28 -10:00
cb8d080f1d
Removes the abstraction on the profiler, no need for a resolver, it will work in unit tests and we can override the provider if needed.
...
Added better support for MVC profiling by using the built in ProfilingViewEngine and ProfilingActionFilter.
2013-05-12 19:05:49 -10:00
67b57dea50
Changes profiler over to use a resolver and uses an interface for it. Changes core over to use a
...
LogProfiler and the web project to use a web profiler (MiniProfiler). Fixes medium trust implementation,
adds performance check for binding to begin request, changes Web profiler over to be decoupled from the
umbraco application objects (binds to events by itself)
2013-05-12 15:25:46 -10:00
e4e0bcf642
Correct spelling error
2013-04-16 04:27:03 -02:00
efbc461da9
Code cleanup - removing all internal code related to Macros, which was created for v6 but left out for backwards compatibility.
2013-04-07 17:47:10 -02:00
Stephan