Shannon
|
9a9237e78e
|
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
src/Umbraco.Core/Services/IMembershipUserService.cs
src/Umbraco.Tests/PublishedContent/PublishedContentTestElements.cs
src/Umbraco.Web.UI/config/trees.config
src/Umbraco.Web.UI/config/umbracoSettings.config
src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
src/Umbraco.Web.UI/umbraco/developer/DataTypes/editDatatype.aspx
src/Umbraco.Web.UI/umbraco/plugins/uGoLive/Dashboard.ascx
src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
src/Umbraco.Web/Search/ExamineEvents.cs
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/umbraco.presentation/content.cs
src/Umbraco.Web/umbraco.presentation/umbraco/cache/LegacyClasses.cs
|
2014-03-06 20:22:32 +11:00 |
|
Stephan
|
3b6dcc3421
|
Factor Dictionary.ReplaceKey method
|
2014-03-05 15:46:33 +01:00 |
|
Shannon
|
e02dddc747
|
obsoleting legacy prop eds
|
2013-09-25 19:03:05 +10:00 |
|
leekelleher
|
37860b4015
|
Replaced all hard-coded GUID references to use the new Constants.
|
2013-03-14 22:00:37 +00:00 |
|
shannon@ShandemVaio.home
|
580cb340ac
|
Cleaning up folder structure (U4-56)
|
2012-06-22 20:39:48 +04:00 |
|