Sebastiaan Janssen 9949e2676d Merge branch 'dev-v7' into 7.4.0 ...

Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/src/less/main.less
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/Dashboard.Release.config
	src/Umbraco.Web/Umbraco.Web.csproj

2015-12-01 15:16:57 +01:00

..

ParameterEditors

Fixes: U4-3796 No media macro parameter in v7

2013-12-10 14:13:56 +11:00

ValueConverters

Moves the grid configuration to a config class so it can be re-used. Updates the BackOfficeController to use the new config classes. Creates a new Grid property value converter (which can be overridden by user's ones) which merges the grid config values at runtime so we are not storing stale grid config values with the actual property value. Now we need to ensure that the grid doesn't post or persist these config values since they don't belong there.

2015-06-16 15:04:31 +02:00

CheckBoxListPropertyEditor.cs

Added icons and groups on all core editors

2015-06-24 21:43:14 +02:00

ColorListPreValueEditor.cs

fixes some compatibility issues with PR for sortable pre-vals

2014-03-25 14:14:09 +11:00

ColorPickerPropertyEditor.cs

Added icons and groups on all core editors

2015-06-24 21:43:14 +02:00

ContentPickerPropertyEditor.cs

Merge branch 'dev-v7' into 7.4.0

2015-12-01 15:16:57 +01:00

DatePreValueEditor.cs

Allows the date + time picker to specify a format in the pre-values.

2015-06-18 10:14:31 +02:00

DatePropertyEditor.cs

Added icons and groups on all core editors

2015-06-24 21:43:14 +02:00

DateTimePropertyEditor.cs

Added icons and groups on all core editors

2015-06-24 21:43:14 +02:00

DateTimeValidator.cs

Fixes: U4-3350 Content Validation: Can't get rid of DateTime error

2013-11-07 14:58:41 +11:00

DecimalPropertyEditor.cs

Implemented decimal property editor

2015-10-14 09:59:09 +02:00

DropDownMultiplePropertyEditor.cs

Added icons and groups on all core editors

2015-06-24 21:43:14 +02:00

DropDownMultipleWithKeysPropertyEditor.cs

Added icons and groups on all core editors

2015-06-24 21:43:14 +02:00

DropDownPropertyEditor.cs

Added icons and groups on all core editors

2015-06-24 21:43:14 +02:00

DropDownWithKeysPropertyEditor.cs

Added icons and groups on all core editors

2015-06-24 21:43:14 +02:00

EmailAddressPropertyEditor.cs

Added icons and groups on all core editors

2015-06-24 21:43:14 +02:00

FileUploadPropertyEditor.cs

Merge branch 'dev-v7' into dev-v7-contenttypeeditor

2015-07-13 09:49:34 +02:00

FileUploadPropertyValueEditor.cs

Fixing split separator for thumbnailSizes in FileUploadPropertyValueEditor.

2015-11-30 19:18:57 +01:00

FolderBrowserPropertyEditor.cs

merge

2015-10-22 18:07:17 +02:00

GridPropertyEditor.cs

Added icons and groups on all core editors

2015-06-24 21:43:14 +02:00

ImageCropperPropertyEditor.cs

Merge branch 'dev-v7' into dev-v7-contenttypeeditor

2015-07-13 09:49:34 +02:00

ImageCropperPropertyValueEditor.cs

Don't do a ToString() in a IsNullOrEmpty..

2014-05-28 16:37:16 +02:00

IntegerPropertyEditor.cs

Fixes: U4-7246 Integer datatype PropertyEditor is missing ValueType definition

2015-10-14 09:59:13 +02:00

LabelPropertyEditor.cs

Added icons and groups on all core editors

2015-06-24 21:43:14 +02:00

ListViewPropertyEditor.cs

add layouts prevalue editor to list view

2015-10-06 21:03:00 +02:00

MacroContainerPropertyEditor.cs

Added icons and groups on all core editors

2015-06-24 21:43:14 +02:00

MarkdownPropertyEditor.cs

Added icons and groups on all core editors

2015-06-24 21:43:14 +02:00

MediaPickerPropertyEditor.cs

Added icons and groups on all core editors

2015-06-24 21:43:14 +02:00

MemberGroupPickerPropertyEditor.cs

Added icons and groups on all core editors

2015-06-24 21:43:14 +02:00

MemberPickerPropertyEditor.cs

Added icons and groups on all core editors

2015-06-24 21:43:14 +02:00

MultiNodeTreePickerPropertyEditor.cs

Merge branch 'dev-v7' into 7.4.0

2015-12-01 15:16:57 +01:00

MultipleMediaPickerPropertyEditor.cs

Added icons and groups on all core editors

2015-06-24 21:43:14 +02:00

MultipleTextStringPropertyEditor.cs

Added icons and groups on all core editors

2015-06-24 21:43:14 +02:00

PropertyEditorAssetAttribute.cs

Completes: U4-3712 Allow c# property editors to have custom js injected into the js initialization block so they can load in angular controllers

2013-11-28 14:27:58 +11:00

PropertyValueEditorWrapper.cs

merge

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

PublishValuesMultipleValueEditor.cs

Bugfix property value editors null-checks

2015-05-18 16:24:53 +02:00

PublishValueValueEditor.cs

Bugfix property value editors null-checks

2015-05-18 16:24:53 +02:00

RadioButtonsPropertyEditor.cs

Added icons and groups on all core editors

2015-06-24 21:43:14 +02:00

RelatedLinksPropertyEditor.cs

Added icons and groups on all core editors

2015-06-24 21:43:14 +02:00

RichTextPreValueController.cs

Fixes thread safety issue with RichTextPreValueController

2014-03-24 16:32:42 +11:00

RichTextPreValueEditor.cs

merge

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

RichTextPropertyEditor.cs

Added icons and groups on all core editors

2015-06-24 21:43:14 +02:00

RteEmbedController.cs

Adds logging to the RteEmbedController when there's an exception, instead of silently swallowing the error

2014-07-23 14:04:50 +02:00

SliderPropertyEditor.cs

Added icons and groups on all core editors

2015-06-24 21:43:14 +02:00

TagPropertyEditorTagDefinition.cs

Undoes the comma encoding for tags and istead adds support to store the tags as json or csv (U4-4741)

2014-05-15 12:49:03 +10:00

TagsDataController.cs

nearly got tag typeahead working

2014-05-05 19:07:57 +10:00

TagsPropertyEditor.cs

Added icons and groups on all core editors

2015-06-24 21:43:14 +02:00

TextAreaPropertyEditor.cs

Added icons and groups on all core editors

2015-06-24 21:43:14 +02:00

TextboxPropertyEditor.cs

Added icons and groups on all core editors

2015-06-24 21:43:14 +02:00

TrueFalsePropertyEditor.cs

Added icons and groups on all core editors

2015-06-24 21:43:14 +02:00

UploadFileTypeValidator.cs

merge

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

UserPickerPropertyEditor.cs

Added icons and groups on all core editors

2015-06-24 21:43:14 +02:00

ValueListPreValueEditor.cs

Fixes issues relating to adding ability to sort pre-values, had to update all property editors that use the shared sortable pre-values, ensure the list items are an array and then sorted.

2014-03-26 13:01:53 +11:00