Shannon
|
59f8508332
|
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
src/Umbraco.Core/Attempt{T}.cs
src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
|
2014-02-20 13:40:17 +11:00 |
|
Shannon
|
1618ac86b8
|
Adds implicit bool operator for Attempt, makes things nicer to check for success :)
|
2014-02-19 22:45:22 +11:00 |
|
Per Ploug Krogslund
|
7440855c72
|
merge
|
2013-11-07 17:16:22 +01:00 |
|
Stephan
|
32e3048717
|
Core.Attempt - refactor Succ() into Succeed()
|
2013-09-11 09:30:00 +02:00 |
|
Stephan
|
9ca048f0ad
|
Core.Attempt - maintain backward compatibility
|
2013-09-10 17:56:49 +02:00 |
|
Stephan
|
85ab96f71a
|
Core.Attempt - refactor and cleanup
|
2013-09-10 17:56:47 +02:00 |
|