Per Ploug Krogslund
|
7440855c72
|
merge
|
2013-11-07 17:16:22 +01:00 |
|
Stephan
|
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 |
|
Stephan
|
15bbe1b829
|
PublishedContentModel - keep it internal for now
|
2013-10-11 10:10:19 +02:00 |
|
Stephan
|
725b938de1
|
PublishedContent - revert to using property.Value vs .ObjectValue
|
2013-09-25 13:17:21 +02:00 |
|
Stephan
|
042973ce19
|
PublishedContent - revert to using property.Value vs .ObjectValue
|
2013-09-25 12:54:24 +02:00 |
|
Stephan
|
bcfb562dde
|
Fix build after merge
|
2013-09-24 09:12:58 +02:00 |
|
Stephan
|
d925f856ae
|
Take care of FIXMEs
|
2013-09-23 16:55:59 +02:00 |
|
Stephan
|
c3caf7ff04
|
PublishedContent - align with v7, refactor IPublishedProperty & names
|
2013-09-19 13:12:18 +02:00 |
|
Stephan
|
f9cae9c4d8
|
PublishedContent - align with v7, refactor IPropertyValueConverter
|
2013-09-19 12:07:43 +02:00 |
|
Stephan
|
85cb7fadfc
|
PublishedContent - implement a model factory
|
2013-09-16 17:17:48 +02:00 |
|
Stephan
|
0415a31d0e
|
PublishedContent - the big refactoring
|
2013-09-16 17:17:45 +02:00 |
|