Shannon 78336181ea Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 ...

Conflicts:
	src/Umbraco.Core/Models/Membership/MembershipExtensions.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Security/MembershipProviderBase.cs
	src/Umbraco.Core/Services/IMemberService.cs
	src/Umbraco.Tests/App.config
	src/Umbraco.Tests/Membership/MembershipProviderBaseTests.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/tinyMceConfig.Release.config
	src/Umbraco.Web.UI/config/tinyMceConfig.config
	src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js
	src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentControl.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/member.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs
	src/umbraco.controls/TabView.cs
	src/umbraco.providers/members/UmbracoMembershipProvider.cs

2014-01-02 15:28:42 +11:00

..

Application

Merge remote-tracking branch 'origin/6.2.0' into 7.0.2

2014-01-02 15:28:42 +11:00

CodeArea

Merge remote-tracking branch 'origin/6.2.0' into 7.0.0

2013-10-09 11:12:33 +11:00

CodeMirror

removes the xquery tests - we don't need these and r# keeps wanting to run them

2013-12-16 13:22:52 +11:00

colorpicker

…

ContextMenu

…

Dashboards

…

datepicker

Added events.Service and xmlhelper.service

2013-08-12 15:17:34 +02:00

DateTimePicker

Merge pull request #115 from stocksr/6.2.0

2013-09-01 17:24:03 +02:00

Dialogs

Fixes: U4-3534 Sorting content items

2013-11-15 12:57:28 +11:00

Editors

Fixes: U4-3576 When editing file based items and changing the file name - we need to change the route location

2013-11-21 17:23:48 +11:00

FileUploader/js

…

FolderBrowser

Fixing the folder uploader for media section

2013-08-16 15:41:13 +02:00

GenericProperty

Improves the property safe alias lookup

2013-10-28 22:57:57 +01:00

IconPicker

merge

2013-11-07 17:16:22 +01:00

imagecropper

…

images

…

Installer

Add progress status on starter kit install

2013-11-05 11:24:53 +01:00

Jeditable

…

MacroContainer

…

MaskedInput

…

menuicon

…

modal

…

mousewheel

Added events.Service and xmlhelper.service

2013-08-12 15:17:34 +02:00

Panel

Fixed up gravatar with a watch, started implementing legacy proxy JS notification calls to our angular services.

2013-06-25 14:02:31 +10:00

passwordStrength

Fixes a lot -

2013-10-22 13:41:04 +11:00

Preview

…

progressBar

…

propertypane

Added node type to quick search(as a toooltip).

2013-09-23 16:19:05 -04:00

scrollingmenu

…

simpleEditor/images

…

splitbutton

…

tablesorting

Added events.Service and xmlhelper.service

2013-08-12 15:17:34 +02:00

tabview

…

tags

Added events.Service and xmlhelper.service

2013-08-12 15:17:34 +02:00

tinymce3

Merge remote-tracking branch 'origin/6.2.0' into 7.0.2

2014-01-02 15:28:42 +11:00

Tree

Merge remote-tracking branch 'origin/6.2.0' into 7.0.0

2013-08-28 11:08:23 +10:00

ui

Merge remote-tracking branch 'origin/6.2.0' into 7.0.0

2013-08-28 11:08:23 +10:00