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

151 Commits

Author SHA1 Message Date
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
Morten Christensen
e61b567ee1 Fixes #U4-2270 and #U4-2269 2013-05-27 08:45:07 -02:00
Morten Christensen
780908e24f Fixing merge issues and updating nodeSorter to use EntityService and new Sort method for improved performance. 
Fixes #U4-1750
 2013-05-23 11:34:06 -02:00
Morten Christensen
3ac7e237c4 Merge with 6.0.6 2013-05-23 10:38:09 -02:00
Morten Christensen
6943a454f3 Implementing Sort-method for the Content/MediaService 2013-05-23 10:29:44 -02:00
Shannon Deminick
153fe248a7 Fixes ContentService fix for issue U4-1772, we don't want to truncate! Plus the truncate term doesn't work in SQLCE anyways. 2013-04-25 19:33:53 -10:00
Sebastiaan Janssen
aa84a3f7f2 Fixes U4-2138 Copying a node reverses sort order in target 2013-04-23 12:49:33 -02:00
Morten Christensen
222723b8fe Fixes #U4-2004 so GetPublishedDescendants retrieves the published version and not the latest version. 2013-04-21 09:06:22 -02:00
Morten Christensen
0632ffb93d Fixes #U4-2069 2013-04-20 11:03:57 -02:00
Morten Christensen
7ed5a6f706 Fixes #U4-2068 and #U4-2125 
Creating test for verifying path is correctly updated when moving items to the recycle bin.
 2013-04-19 06:07:25 -02:00
Sebastiaan Janssen
eb2db791b8 Additional fix for U4-2105 Saving a document will make it look like it is unpublished 2013-04-15 07:33:26 -02:00
Morten Christensen
b4fd2f6d46 Fixing oversight in SaveAndPublish method - content might not have an Id yet, so take that into account. 2013-04-29 07:09:23 -02:00
Shannon Deminick
056696d36f Fixes up more issues with cmsContentXml - got media updating properly now, nearly the same as content and all done with 
the new API.
 2013-04-25 22:13:05 -10:00
Shannon Deminick
d2a285c120 Merge with 6.0.5 2013-04-25 19:43:03 -10:00
Shannon Deminick
710c8aa6ea Merge with 6.0.4 2013-04-23 21:52:07 -10:00
Shannon Deminick
12de5d6ed3 Merge with 6.0.4 2013-04-20 00:12:52 +06:00
Shannon Deminick
9137ce7cf4 Merge with 6.0.4 2013-04-17 01:57:50 +06:00
Morten Christensen
7610ee5f8b Adding event proxies to the ContentService for publishing events for easier discoverability. 
Fixes U4-2046
 2013-04-04 07:16:33 -02:00
Sebastiaan Janssen
17533c57d3 Merge with 6.0.4 2013-04-04 10:04:29 -02:00
Shannon Deminick
132ec1702c Merge with 6.0.3 2013-03-26 22:09:50 +06:00
Sebastiaan Janssen
9dde86d591 Fixes U4-1999 When copying content with subcontent, the new subcontent data is a 
direct reference to the old.
 2013-03-26 08:39:50 -01:00
Shannon Deminick
d976fbe4de Merge with 6.0.3 2013-03-22 22:03:50 +06:00
Morten Christensen
c5710277a5 Redoing the fix for U4-1875 2013-03-22 12:13:06 -01:00
Morten Christensen
b4d5658d45 Fixes U4-1828 by correctly incrementing the sortorder ... doh! 2013-03-21 17:34:08 -01:00
Morten Christensen
d485c3da97 Fixes U4-1875 by correcting the Creating events in the ContentService and MediaService, so null is returned if the creation of an object is cancelled. 
In the legacy Document and Media classes we check if the created object is null to determine if the event has been cancelled through the new api.
 2013-03-21 16:09:45 -01:00
Shannon Deminick
ab8b0f4ebb Merge with 6.0.3 2013-03-21 20:39:33 +06:00
Shannon Deminick
adedc9b64b Ensures mocked test entities don't have dirty properties on initialization. Ensures content xml structure 
is rebuilt when a content type's alias is changed or a property type is removed from it. Adds ability  to rebuild
content xml structures for specified content types, not for all content. Adds ContentTypeExtensions and
more unit tests for ContentTypeTests. Changes RuntimeCacheProvider to use new ConcurrentHashSet instead of a dictionary
with the same key/value. Adds overload to IRepositoryCacheProvider to clear cache by type. Clears the IContent cache when
a Content type is saved.
All relates to fixing #U4-1943
 2013-03-20 20:53:12 +06:00
Morten Christensen
d0787e92fe Implementing PackagingService and moving Import Export methods to this service to have it specialized and centralized around packaging operations. 2013-03-20 13:51:46 -01:00
Morten Christensen
ffe9953c43 Merge 2013-03-19 20:08:40 -01:00