Shannon
|
70eb3e8613
|
Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
.gitignore
src/Umbraco.Core/Models/PropertyExtensions.cs
src/Umbraco.Tests/Models/DataValueSetterTests.cs
src/Umbraco.Tests/Umbraco.Tests.csproj
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/RegisterMember.cshtml
src/Umbraco.Web/Controllers/RegisterController.cs
src/Umbraco.Web/Models/ProfileModel.cs
src/Umbraco.Web/Models/RegisterModel.cs
src/Umbraco.Web/Models/UmbracoProperty.cs
src/Umbraco.Web/UmbracoModule.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
|
2013-09-03 17:30:08 +10:00 |
|
perploug
|
623a28c158
|
delete fontawesome
|
2013-09-02 15:40:14 +02:00 |
|
Sebastiaan Janssen
|
2bdbd6c7d9
|
Updated controller, more flexible, moved UmbracoProperty to Umbraco.Web.Helpers
|
2013-08-29 16:12:50 +02:00 |
|
Sebastiaan Janssen
|
49637e62fe
|
Updated, more robust versions of the Member template/snippets
|
2013-08-28 17:52:06 +02:00 |
|
Sebastiaan Janssen
|
f26d759c84
|
Moved controllers and models as per Shannon's suggestion
Added LoginStatus and updated Register
Updated to use CDF instead of <script> tags
|
2013-08-28 13:36:04 +02:00 |
|