Shannon
c20984dca7
Merge branch 'dev-v7' of https://github.com/aadfPT/Umbraco-CMS into aadfPT-dev-v7
Conflicts:
src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
src/Umbraco.Core/Services/ContentService.cs
src/Umbraco.Core/Services/IContentService.cs
src/Umbraco.Core/Services/IMediaService.cs
src/Umbraco.Core/Services/IMemberService.cs
src/Umbraco.Core/Services/MediaService.cs
src/Umbraco.Core/Services/MemberService.cs
src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
src/Umbraco.Web.UI.Client/src/common/resources/member.resource.js
src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
src/Umbraco.Web/Editors/ContentController.cs
src/Umbraco.Web/Editors/MediaController.cs
src/Umbraco.Web/Editors/MemberController.cs
src/Umbraco.Web/WebApi/Filters/DisableBrowserCacheAttribute.cs
src/UmbracoExamine/UmbracoMemberIndexer.cs
2016-04-05 16:20:39 +02:00
..
2015-09-11 17:49:47 +02:00
2015-09-11 17:49:47 +02:00
2016-03-16 13:41:58 +01:00
2015-11-26 13:24:40 +01:00
2016-03-07 15:13:31 +01:00
2016-03-16 10:10:31 +01:00
2016-01-26 17:05:46 +01:00
2016-04-05 16:20:39 +02:00
2016-04-05 16:20:39 +02:00
2015-07-23 18:30:20 +02:00
2015-08-26 14:00:53 +02:00
2015-09-22 18:16:35 +02:00
2015-07-30 18:14:29 +02:00
2015-08-26 14:00:53 +02:00
2015-08-26 14:00:53 +02:00
2016-02-02 15:33:22 +01:00
2015-02-03 20:58:05 +01:00
2015-01-30 10:32:46 +11:00
2016-01-22 17:09:44 +01:00
2016-02-04 14:51:19 +01:00