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

179 Commits

Author SHA1 Message Date
Shannon
acb2e58a5c Completes: U4-3067 Send to publish not implemented 2013-10-31 18:28:02 +11:00
Shannon
8188f66892 Implements: U4-3171 Create an interface for RelationService 2013-10-18 10:35:04 +11:00
Shannon
e2e40a3356 Fixes content service publishing status when parent isn't published, fixes listview to properly have selected checkbox (ng-checked is not supposed to be used), fixes the pre-check if nothing is actually selected before performing bulk operations - U4-3149 2013-10-15 14:11:28 +11:00
Shannon
a87b37d6ca Cleans up more of the IContentService and ensures that we have PublishStatus returned from the publishing methods instead of hiding them internally. 2013-10-10 09:35:23 +11:00
Shannon
858135175e Completes: U4-2956 Update all services with correct public methods/properties 2013-10-09 15:21:01 +11:00
Shannon
f356b94c39 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
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
 2013-09-25 19:09:16 +10:00
Morten Christensen
5cf07ba6be Refactoring how DeleteVersion and DeleteVersions is used in the Content- and MediaRepository, so we ensure that the latest version is never deleted. Worse case would have been an incomplete content node, which we want to avoid. So better to have a fail safe way of deleting versions, and use the regular Delete method for deleting the latest version. 2013-09-18 11:49:36 +02:00
Shannon
371b1817ea Merge remote-tracking branch 'origin/7.0.0' into 7.0.0--property-editor-guid-to-alias 
Conflicts:
	src/Umbraco.Core/Configuration/LegacyUmbracoSettings.cs
	src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterColumnExpression.cs
	src/Umbraco.Core/PropertyEditors/TinyMcePropertyEditorValueConverter.cs
	src/Umbraco.Core/XmlHelper.cs
	src/Umbraco.Tests/ObjectExtensionsTests.cs
	src/Umbraco.Web/PropertyEditors/RteMacroRenderingPropertyEditorValueConverter.cs
	src/Umbraco.Web/Routing/DefaultUrlProvider.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/macro.cs
 2013-09-17 00:27:17 +10:00
Stephan
d1af20424e merge branch '6.2.0' into '7.0.0' 2013-09-12 13:09:04 +02:00
Shannon
e75c050eff Merge branch '7.0.0' into 7.0.0--property-editor-guid-to-alias 
Conflicts:
	src/Umbraco.Core/Models/Rdbms/PropertyDataReadOnlyDto.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
 2013-09-11 13:07:22 +10:00
Stephan
85ab96f71a Core.Attempt - refactor and cleanup 2013-09-10 17:56:47 +02:00
Shannon
5036df4174 Fixes permissions issue with default permissions and ensures default permissions come from the user type instead of the unused db column in the umbracoUser table. Fixes up the FilterAllowedOutgoingContentAttributeTests attribute with the new permissions changes. Fixes: U4-2771 Content sort dialog, ysod on loading children 2013-09-10 13:38:45 +10:00
Shannon
45dabd6293 Lots of work on U4-2722 Change Property Editors over to use unique alias instead of GUID 
it compiles but i haven't had time to test anything yet, will start all unit testing/fixing tomorrow, just needed to save this work somewhere.
 2013-09-05 18:38:54 +10:00
Shannon
89ce60ef0f Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Events/RecycleBinEventArgs.cs
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/SimilarNodeNameComparer.cs
	src/Umbraco.Web.UI/config/ExamineIndex.config
	src/Umbraco.Web/Strategies/DeleteFilesAfterEmptiedRecycleBin.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2013-08-15 12:59:05 +10:00
Morten Christensen
67a2a9cfe4 Refactoring the optimized Recycle Bin, so that the Recycle Bin's repository is more independent and easier to use with the new events added to the Content- and MediaService. 2013-08-14 16:12:13 +02:00
Shannon
cc5912f7e1 Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2013-08-09 11:17:38 +10:00
Morten Christensen
b4f9985695 Last bits to implement U4-2571 Need to optimize empty recycle bin 2013-08-08 15:12:26 +02:00
Shannon
0a26eccd2d Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 
Conflicts:
	.gitignore
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Core/Models/PropertyTypeExtensions.cs
	src/Umbraco.Core/Security/AuthenticationExtensions.cs
	src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs
	src/Umbraco.Core/Security/UserData.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
	src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web/Security/WebSecurity.cs
	src/Umbraco.Web/UmbracoModule.cs
	src/umbraco.businesslogic/BasePages/BasePage.cs
	src/umbraco.cms/businesslogic/datatype/DefaultData.cs
	src/umbraco.sln
 2013-08-07 10:29:34 +10:00
Shannon
66fc7e91dd Got the GetChildren wired up to the back end, updated the sort and list view controls to use the new resource with promises, updated unit tests to support. 2013-08-06 18:42:36 +10:00
Shannon
b7a1123319 U4-2579 BulkPublishController causes YSOD when there are invalid child elements due to InvalidProperties having a null reference 2013-08-02 16:23:32 +10: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
Shannon
a195d33332 Added another benchmark for removing/re-inserting records for cmsContentXml table using one transaction which again improves performance. Now have changed the rebuild xml method in the content service to : Lookup all data that it needs to insert first, then we begin a transaction and inside of the one transaction we clear the data and re-insert it so if anything fails in this process it should be rolled back. 2013-07-29 17:45:05 +10:00
Shannon
b9ba350a2f Updated the RebuildXmlStructures method with performance improvements. Added cache checking to the GetByPublishedVersion method since published content should always be 'latest' this will speed things up tremendously if items are found there. Added 2 more performance tests which show very large perf improvements, namely the Get_All_Published_Content_Of_Type shows a 77% improvement. 2013-07-29 15:49:56 +10:00
Shannon
696306e7c9 Implements the bulk insert procedure for re-populating the cmsContentXml tables, removes the need to rebuild all xml structures when sorting if in LB environments 2013-07-29 13:25:02 +10:00
Shannon
ed88bbf75f Fixed up BaseDatabaseFactoryTests so that it only loads in one db factory with the correct conn strings, now we can easily override to use a custom db. Added benchmark tests for bulk inserting records for the cmsContentXml table which shows how we can improve performance quite a bit especially for larger node sets. Added more unit tests for bulk inserting and fixed it up a bit more. 2013-07-26 18:13:56 +10:00
Shannon
500d25fd5a Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs
 2013-07-24 13:10:43 +10:00
Shannon
7f4abb4893 Fixed editContent.aspx to let the business logic handle the property validation when trying to publish and show the correct status message result (if it was not publishable). Adds the invalid properties collection to the PublishStatus so those can be shown too. 2013-07-24 12:54:10 +10:00
Shannon
5dc43e99fa Got media controllers working just like content, have tried to share as much code as possible between them. Can probably do a bit better but there's minimal code replication. 2013-07-23 18:55:31 +10:00
Shannon
4df80eb976 Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
 2013-07-23 13:41:42 +10:00
Shannon
8be54ba0cc Fixes: U4-1970 v6 API - need to implement caching for templates since we're doing a db lookup on a front-end request. This is a temporary fix until we implement the ApplicationCache properly but it still works by utilizing the existing RuntimeCacheProvider singleton. I've tweaked this provider as well to ensure we use the HttpRuntime.Cache when it is available (during a web session). We don't want to have a seperate caching bucket so that IIS can manage cache memory properly. Have ensured that the template cache is cleared when templates are updated/removed. 2013-07-23 11:46:18 +10: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
173d388c12 Fixes #U4-2450 2013-07-04 12:31:31 +02:00
Shannon
9e419f9bcc Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 2013-07-02 12:58:40 +10:00
Morten Christensen
ccbb838cef Fixing another part of #U4-2186 2013-06-27 10:56:45 +02:00
Morten Christensen
188aca499a Merge branch '6.0.7' into 6.1.2 2013-06-25 11:54:24 +02:00
Morten Christensen
3040d362ef Fixes #U4-2361 2013-06-25 11:48:37 +02:00
Shannon
b4ba57695e Merge branch '6.1.2' into 7.0.0 2013-06-20 10:09:39 +10:00
Sebastiaan Janssen
c8a19dff44 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Web/Media/ImageUrl.cs
	src/Umbraco.Web/Media/ImageUrlProviders/ImageUrlProvider.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MediaExtensions.cs
 2013-06-19 18:26:45 +02:00
Sebastiaan Janssen
26e4091f28 Due to previous fix we don't need to sort individually any more 
(see changeset 32f86f750e)
 2013-06-19 16:01:50 +02:00
Dennis Ravn Pedersen
32f86f750e Query would reverse logic sorting of children. Would make move operations ignore sorting. 
Signed-off-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
 2013-06-19 15:36:08 +02:00
Sebastiaan Janssen
556c2d625f Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/umbraco.cms/businesslogic/member/Member.cs
 2013-06-19 14:42:14 +02:00
Sebastiaan Janssen
9ac4c7aef5 Merge branch 'master' of https://github.com/umbraco/Umbraco-CMS 2013-06-19 14:14:51 +02:00
Jeremy Pyne
5e2c3a0a8b Fixed a type on content copy. 2013-06-18 10:38:08 -04:00
Jeremy Pyne
f5121bd183 Fix for U4-2384. Author not changed to current user when a node is copied. 2013-06-18 09:35:33 -04:00
Shannon
c055dedee9 GetByIds content method 2013-06-11 14:43:36 +02:00
Morten Christensen
db7cb2dcb4 Merge with 6.0.6 2013-05-29 13:18:40 -02:00
Morten Christensen
6281268954 Updating sort method in Content- and MediaService 2013-05-29 13:18:03 -02:00
Morten Christensen
f6e44b4e7c Merge with 6.0.6 2013-05-29 05:38:35 -02:00
Morten Christensen
8e1c45e981 Updating Sort methods to skip items that hasn't been sorted 2013-05-29 05:37:55 -02:00
Morten Christensen
634e4a6949 Merge with 6.0.6 2013-05-27 08:47:14 -02:00