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

60 Commits

Author SHA1 Message Date
Stephan
8a1db41fc4 Implement content.FirstChild 2014-06-09 13:04:40 +02:00
Stephan
a39a659858 Bugfix published content extension .Next() 2014-04-16 19:10:50 +02:00
Stephan
a4b1b31a24 U4-4241 - UrlAbsolute() returns relative urls 2014-02-17 10:49:26 +01:00
Shannon
78336181ea Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Core/Models/Membership/MembershipExtensions.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Security/MembershipProviderBase.cs
	src/Umbraco.Core/Services/IMemberService.cs
	src/Umbraco.Tests/App.config
	src/Umbraco.Tests/Membership/MembershipProviderBaseTests.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/tinyMceConfig.Release.config
	src/Umbraco.Web.UI/config/tinyMceConfig.config
	src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js
	src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentControl.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/member.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs
	src/umbraco.controls/TabView.cs
	src/umbraco.providers/members/UmbracoMembershipProvider.cs
 2014-01-02 15:28:42 +11:00
Shannon
c8fa2b3880 Merge branch 'abjerner-patch-1' into 6.2.0 
Conflicts:
	src/Umbraco.Web/PublishedContentExtensions.cs
 2013-12-24 11:08:48 +11:00
Anders Bjerner
e17b5e6a7b Update PublishedContentExtensions.cs 
Added overloaded extension methods for Next() and Previous() to take a delegate (eg. lambda expression) as a second parameter. The methods are based on this thread by Jeavon Leopold: http://our.umbraco.org/forum/developers/razor/46832-Filtered-Next()-and-Previous()-v7-UmbracoHelperMVC

The code is tested in 7.0.0, but since it only relies on the existing Next() and Previous() methods, it should work in 6.1.x and 7.1.1 as well.
 2013-12-12 15:32:52 +01:00
Shannon
6cf510a9be More tests fixed 2013-11-04 19:47:09 +11:00
Shannon
e707506303 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 2013-10-28 12:36:27 +11:00
Shannon
49d5791825 Adds DescendantsOrSelf extensions on ienumerable to published content extensions 2013-10-28 12:35:50 +11:00
Shannon
92c7b4446b Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AddChangeDocumentTypePermission.cs
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AdditionalIndexesAndKeys.cs
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
 2013-10-18 11:27:32 +11:00
Sebastiaan Janssen
14e3976e88 Merge pull request #142 from lars-erik/6.2.0-recursive_isofdocumenttype 
Recursive PublishedContentExtensions IsDocumentType
 2013-10-16 02:55:09 -07:00
Lars-Erik Aabech
a1ef40e4be Split the recursive IsDocumentType into an overload for "real" backwards compatibility. 
Changed string comparison to use InvariantEquals. (guessing it doesn't _really_ break backw. compat?)
Added XML docs.
 2013-10-16 11:38:58 +02:00
Stephan
34875855db U4-3095 - Fix IPublishedContent navigation axes 2013-10-11 10:27:49 +02:00
Stephan
4a58fbfa1d PublishedContent - add OfType<> extension to IPublishedContent 2013-09-29 15:22:19 +02:00
Lars-Erik Aabech
b6777e4635 Recursive PublishedContentExtensions IsDocumentType 
Optional recursive parameter defaulted to false for backwards compatibility and no performance hit.
Settings recursive = true fetches content type for content and checks ancestor content types for the same alias.
 2013-09-27 13:12:16 +02:00
Stephan
725b938de1 PublishedContent - revert to using property.Value vs .ObjectValue 2013-09-25 13:17:21 +02:00
Stephan
eb4317a9c1 Take care of FIXMEs 2013-09-23 13:08:45 +02:00
Stephan
c3caf7ff04 PublishedContent - align with v7, refactor IPublishedProperty & names 2013-09-19 13:12:18 +02:00
Stephan
08566f32de Take care of more FIXMEs 2013-09-18 10:09:05 +02:00
Stephan
e8fd6a6ece Take care of FIXMEs 2013-09-17 10:18:26 +02:00
Stephan
ee4f4440d5 PublishedContent - implement strongly typed methods for other axes 2013-09-16 17:17:51 +02:00
Stephan
f4d060f3eb PublishedContent - implement strongly typed methods for parent, children, ancestors & descendants axes 2013-09-16 17:17:49 +02:00
Stephan
0415a31d0e PublishedContent - the big refactoring 2013-09-16 17:17:45 +02:00
Shannon
581f3a1893 Fixes build errors 2013-08-29 12:01:30 +10:00
Shannon
9fc3efd73a Fixes U4-2713 Property Editor Value Converters don't get applied to Umbraco.TypedMedia 2013-08-29 11:59:07 +10:00
Sebastiaan Janssen
ad44feb6dd Don't throw exception when node has no template and asking for GetTemplateAlias (return string.Empty instead) 2013-08-23 14:08:13 +02:00
Shannon Deminick
9137ce7cf4 Merge with 6.0.4 2013-04-17 01:57:50 +06:00
Shannon Deminick
ff3fc5d825 Merge with 4.11.7 2013-04-17 01:56:20 +06:00
Stephan
3b9bf7b0f9 U4-2117 - fix Ancestor- vs AncestorsOrSelf inconsistencies 2013-04-16 12:58:03 -02:00
Stephan
3882e1984d U4-2117 - fix Ancestor- vs AncestorsOrSelf inconsistencies 2013-04-16 12:29:58 -02:00
Stephan
2245c88396 U4-2117 - fix Ancestor- vs AncestorsOrSelf inconsistencies 2013-04-16 12:29:58 -02:00
Stephan
ce0c72d9f8 Web.PublishedCache - introduce contextual caches 2013-03-19 17:51:55 -01:00
Shannon Deminick
3ff88bc4fa Fixing strange merge issues. 2013-03-02 03:44:43 +06:00
Shannon Deminick
1bc9d1d9c3 Merge with 4.11.6 2013-03-02 02:45:19 +06:00
Shannon Deminick
b5cbe63a4e Back merged from 6.1 the changes required for #U4-1822 and #U4-1797 2013-03-02 02:43:22 +06:00
Shannon Deminick
4882df43bd Back merged from 6.1 the changes required for #U4-1822 and #U4-1797 2013-03-02 01:50:53 +06:00
Shannon Deminick
3c41871e59 Fixes: #U4-1748 2013-02-22 21:42:38 +06:00
Stephan
ef9ce720b2 Web.PublishedCache - create, migrate 2013-02-05 06:31:13 -01:00
leekelleher
3af7958940 Updated references for alias conventions constants across the solution. 2013-03-18 17:55:02 +00:00
Stephan
8b00e72bf6 Web.Routing - refactor url providing (U4-1321...) + new IUrlProvider 2013-01-31 10:06:25 -01:00
Shannon Deminick
fe9f5b224a Fixing really strange merge issues! 2013-03-02 03:34:37 +06:00
Shannon Deminick
36108df4d0 Merge with 6.0.2 2013-03-02 02:49:24 +06:00
Shannon Deminick
010893a73a Fixes: #U4-1822, #U4-1797 - Is helpers and indexes on result collections using IPublishedContent or DynamicPublishedContent were incorrect, 
added unit tests to support issues and fixes.
 2013-03-02 01:02:38 +06:00
Shannon Deminick
265fd6b91c Merge with 6.0.1 2013-02-23 00:19:05 +06:00
Shannon Deminick
34975183d2 Changed PublishedContentHelper to use 6.0 APIs instead of relying on the WebBootManager hack to set a delegate. 
Fixed up a heap of failing unit tests.
 2013-02-02 07:06:27 +06:00
Shannon Deminick
67f9f14e83 Fixes: #U4-1450 - extension method sigs for IPublishedContent. 2013-01-13 22:36:21 +03:00
Shannon Deminick
e251ccf456 Obsoletes the NiceUrl() and NiceUrlWithDomain() methods on IPublishedContent in favor of Url() and UrlWithDomain() 2012-12-09 03:53:16 +05:00
Shannon Deminick
6267e2e340 Adds support for NiceUrl() for media. 2012-12-09 03:51:02 +05:00
Shannon Deminick
44ccfc0262 Adds 'Url', 'ItemType' and the Indexed property alias to IPublishedContent. 
Changes Properties to ICollection instead of Collection for IPublishedContent.
Creates PublishedContentBase object which handles the Url and Indexed property on IPublishedContent automatically so implementors should use this base
class instead. Moves GetPropertyValue extensions to the Umbraco.Web project instead of the
Umbraco.Core project because this method needs to parse internal links if the value is a string. We require the UmbracoContext
to do this so they must exist in the Web project.
 2012-12-09 03:22:11 +05:00
Shannon Deminick
66fe539d1c Fixes class reference issues 2012-12-07 20:08:06 +05:00