Shannon d281f97659 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 ...

Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.designer.cs
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web.UI/umbraco/config/create/UI.xml
	src/Umbraco.Web.UI/umbraco/create/DLRScripting.ascx
	src/Umbraco.Web.UI/umbraco/create/xslt.ascx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoHelper.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx

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

..

Application

Allows legacy editors to sync the tree

2013-10-07 09:48:08 +02:00

CodeArea

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

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

CodeMirror

Getting all the unit tests working again with the GUID to alias change, lots of little fixes everywhere.

2013-09-06 17:50:31 +10:00

colorpicker

…

ContextMenu

Added Edit / Download context menu support for media library

2012-07-31 13:31:31 -01:00

Dashboards

Fixed: #U4-1810, pretty much finished the examine management dashboard.

2013-03-01 03:04:29 +06:00

datepicker

Added events.Service and xmlhelper.service

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

DateTimePicker

U4-516 - Fix DatePicker with time default value

2013-08-27 12:04:20 +01:00

Dialogs

Updating legacy domain, publsh and sort dialogs

2013-10-01 00:47:18 +02:00

Editors

Fixes: U4-2973 - View editor save button broken

2013-10-01 11:51:19 +02:00

FileUploader/js

Put the ++ back instead of + 1

2012-09-04 08:57:56 -02:00

FolderBrowser

Fixing the folder uploader for media section

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

GenericProperty

Updated doctype editor styles

2013-09-18 09:00:23 +02:00

IconPicker

iconpicker legacy file

2013-09-12 14:40:49 +02:00

imagecropper

…

images

…

Installer

Finished the new installer screen report, finished and tested the v7 db upgrade script which is working!! :) Changed over all package manifests to have an alias instead of a GUID.

2013-09-11 18:25:51 +10: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

…

Preview

…

progressBar

…

propertypane

Fixes U4-755 Increase width of Name field to match width of other text fields

2012-09-06 06:00:00 -02:00

scrollingmenu

…

simpleEditor/images

…

splitbutton

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

tablesorting

Added events.Service and xmlhelper.service

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

tabview

Moved tree picker tooltip style to default.css so it also works in editMacro (and elsewhere)

2012-10-07 11:45:22 -02:00

tags

Added events.Service and xmlhelper.service

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

tinymce3

Completes: U4-2917 Remove canvas/live editing support, U4-2916 Remove skinning support

2013-09-25 17:57:44 +10: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