Shannon 0f503fc320 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 ...

Conflicts:
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs
	src/Umbraco.Tests/Services/Importing/ImportResources.resx
	src/Umbraco.Tests/Services/Importing/PackageImportTests.cs
	src/Umbraco.Tests/Services/PackagingServiceTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web/Umbraco.Web.csproj
	src/umbraco.cms/businesslogic/Packager/Installer.cs
	src/umbraco.cms/businesslogic/workflow/Notification.cs
	src/umbraco.macroRenderings/umbraco.macroRenderings.csproj

2014-01-13 14:08:23 +11:00

..

DatePicker

Fixes #U4-2466

2013-07-05 10:51:19 +02:00

Properties

Fixed naming conventions and changed new classes to internal since we shouldn't expose these publicly (they are already legacy)

2013-06-27 15:27:05 +10:00

TreePicker

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

2013-12-19 11:41:03 +11:00

CodeArea.cs

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

2013-10-03 12:51:46 +10:00

DataAttributes.cs

Fixed naming conventions and changed new classes to internal since we shouldn't expose these publicly (they are already legacy)

2013-06-27 15:27:05 +10:00

feedback.cs

Move, Copy, protect, notifications dialogs polish

2013-10-02 00:11:10 +02:00

FieldDropDownList.cs

Standard doc type properties no longer prefixed with @ in "Insert Umbraco page field" dialogue

2012-09-16 10:49:19 -02:00

helper.cs

Cleaning up folder structure (U4-56)

2012-06-22 20:39:48 +04:00

MenuButton.cs

Adds a way to do hotkys on webforms buttons

2013-10-28 21:32:35 +01:00

MenuButtonI.cs

Panel, Tabview, Propertie controls converted

2013-06-26 11:12:06 +02:00

MenuIcon.cs

Crated InsertMacroSplitButton webforms control instead of the hacky js code used to insert the split button in the template editor.

2012-12-31 18:39:36 +03:00

MenuIconClass.cs

Cleaning up folder structure (U4-56)

2012-06-22 20:39:48 +04:00

MenuIconI.cs

Cleaning up folder structure (U4-56)

2012-06-22 20:39:48 +04:00

MenuSplitButton.cs

Fixed naming conventions and changed new classes to internal since we shouldn't expose these publicly (they are already legacy)

2013-06-27 15:27:05 +10:00

packages.config

Fixes various issues relating to File Repositories and Services: U4-4014 FileRepositories offer no way to create folders, U4-4013 The models that the FileService produces causes security exceptions, U4-3993 Replace system.io calls in umbraco.scriptTasks legacy task

2014-01-09 18:08:13 +11:00

pane.cs

legacy Editmacro editor tweaks

2013-09-10 23:33:26 +02:00

Panel.cs

Fixes the grid height issues

2013-09-12 14:38:53 +02:00

ProgressBar.cs

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

2013-10-03 12:51:46 +10:00

Property.cs

labels for localization support

2013-10-09 15:07:09 +02:00

PropertyGroup.cs

Fixed naming conventions and changed new classes to internal since we shouldn't expose these publicly (they are already legacy)

2013-06-27 15:27:05 +10:00

ScrollingMenu.cs

css-template editor tweaks, more compat polish

2013-07-04 13:33:06 +02:00

Splitter.cs

Finally got around to changing all calls to umbraco.IO to Umbraco.Core.IO - that'll clear up several hundreds of warnings :)

2013-10-03 12:45:40 +10:00

TabPage.cs

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

2013-07-24 13:10:43 +10:00

TabView.cs

Fixes: U4-3814 - 6.1.6 XSS vulnerability in backoffice

2013-12-13 10:25:32 +00:00

TreeUrlGenerator.cs

Finally got around to changing all calls to umbraco.IO to Umbraco.Core.IO - that'll clear up several hundreds of warnings :)

2013-10-03 12:45:40 +10:00

umbraco.controls.csproj

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

2014-01-13 14:08:23 +11:00

UmbracoClientDependencyLoader.cs

Fixes uGoLive id and changes dashboard ascx to use CDF to load scripts/styles and using the knockout version shipped in the core.

2013-02-01 06:05:39 +06:00