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

Conflicts:
	src/Umbraco.Core/Models/Rdbms/MemberReadOnlyDto.cs
	src/Umbraco.Core/Models/Rdbms/PropertyDataReadOnlyDto.cs
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/StringExtensions.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
	src/Umbraco.Web/Umbraco.Web.csproj

2013-09-10 11:49:05 +10:00

..

checkboxlist

Replaced all hard-coded GUID references to use the new Constants.

2013-03-14 22:00:37 +00:00

colorpicker

Replaced all hard-coded GUID references to use the new Constants.

2013-03-14 22:00:37 +00:00

datefieldmultiple

Replaced all hard-coded GUID references to use the new Constants.

2013-03-14 22:00:37 +00:00

datepicker

Replaced all hard-coded GUID references to use the new Constants.

2013-03-14 22:00:37 +00:00

dictionaryPicker

Replaced all hard-coded GUID references to use the new Constants.

2013-03-14 22:00:37 +00:00

dropdownlist

Replaced all hard-coded GUID references to use the new Constants.

2013-03-14 22:00:37 +00:00

folderbrowser

Replaced all hard-coded GUID references to use the new Constants.

2013-03-14 22:00:37 +00:00

imagecropper

Fixes: U4-2711 DAMP throws unknown exception on image upload with image cropper

2013-08-29 12:27:49 +10:00

label

Replaced all hard-coded GUID references to use the new Constants.

2013-03-14 22:00:37 +00:00

listbox

Replaced all hard-coded GUID references to use the new Constants.

2013-03-14 22:00:37 +00:00

macrocontainer

Replaced all hard-coded GUID references to use the new Constants.

2013-03-14 22:00:37 +00:00

mediapicker

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

2013-07-23 13:41:42 +10:00

memberpicker

Merge with 6.0.6

2013-05-05 23:39:52 -10:00

MultiNodeTreePicker

Fixes plugin mgr to not resolve types that shouldn't be resolved. Fixes mntp legacy editor to not throw exceptions when initializing because the legacy tree no longer exists. Fixes authentication when an invalid cookie is detected.

2013-08-14 13:38:28 +10:00

MultipleTextstring

Reverted some changes to AbstractDataEditorControl in 7260 to retain backwards compatibility.

2012-08-27 14:59:39 -02:00

numberfield

Merge with 6.0.3

2013-03-25 20:54:49 +06:00

pagepicker

Updated references to the new constants for Application and MediaType aliases.

2013-03-22 13:13:05 +00:00

PickerRelations

Removed .HasRecords check in Picker Relations datatype as not supported by SQL CE (and not required). (Left Picker Relations exlcuded from the project)

2012-07-11 11:48:25 -01:00

Properties

Correcting SolutionInfo and AssemblyInfo, so assembly version is correct for all shipped assemblies

2012-11-26 07:46:29 -01:00

radiobuttonlist

Replaced all hard-coded GUID references to use the new Constants.

2013-03-14 22:00:37 +00:00

relatedlinks

Replaced all hard-coded GUID references to use the new Constants.

2013-03-14 22:00:37 +00:00

SettingControls

Updated references to the new constants for Application and MediaType aliases.

2013-03-22 13:13:05 +00:00

simpleEditor

Replaced all hard-coded GUID references to use the new Constants.

2013-03-14 22:00:37 +00:00

Slider

Fixed U4-1562 YSOD saving a Slider property editor set to DB type Nvarchar.

2013-01-28 17:13:18 +00:00

tags

Fixes #U4-2466

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

textfield

Replaced all hard-coded GUID references to use the new Constants.

2013-03-14 22:00:37 +00:00

textfieldmultiple

Replaced all hard-coded GUID references to use the new Constants.

2013-03-14 22:00:37 +00:00

tinymce

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

2013-09-10 11:49:05 +10:00

tinyMCE3

Completes U4-2744 Remove very old TinyMCE 2 and all that is related to it

2013-08-29 17:45:16 +10:00

ultimatepicker

Replaced all hard-coded GUID references to use the new Constants.

2013-03-14 22:00:37 +00:00

uploadfield

Merge with 6.0.4

2013-04-19 04:40:49 +06:00

userControlWrapper

Replaced all hard-coded GUID references to use the new Constants.

2013-03-14 22:00:37 +00:00

wysiwyg

Cleaning up folder structure (U4-56)

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

XPathCheckBoxList

Added Media and Member support to XPath CheckBoxList

2013-03-01 22:53:14 +00:00

XPathDropDownList

Added Media and Member support to XPath DropDownList

2013-03-01 15:28:03 +00:00

yesno

Replaced all hard-coded GUID references to use the new Constants.

2013-03-14 22:00:37 +00:00

AbstractJsonPrevalueEditor.cs

Updated a ton of Error logging calls to use the new LogHelper but there are still plenty more to go; #u4-7

2012-12-10 05:03:28 +05:00

AbstractOptions.cs

Cleaning up folder structure (U4-56)

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

AbstractPrevalueEditor.cs

Fixed issue with AbstractPrevalueEditor throwing WebResource 404s when implemented by a type outside of the umbraco.editorControl namespace

2012-09-13 17:58:18 -01:00

BaseDataType.cs

Cleaning up folder structure (U4-56)

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

BaseTreePickerEditor.cs

Fixes U4-2397 IContent Properties added with incorrect Value when read from Cache, and adds unit test for verifying types saved and returned for 24 standard DataTypes.

2013-08-12 16:20:32 +02:00

CsvToXmlData.cs

Cleaning up folder structure (U4-56)

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

DataTypeGuids.cs

Updated GUID references in editorControls and uQuery to use the new Constants.

2013-03-14 21:58:31 +00:00

DefaultData.cs

Converted much of the old logging to use the new logging. All calls for log types: Login, Logout,

2012-12-10 04:22:29 +05:00

DefaultDataKeyValue.cs

2nd attempt: U4-2514 Checkboxlist prevalues in packages broken

2013-07-23 13:16:18 +02:00

DefaultPrevalueEditor.cs

Cleaning up folder structure (U4-56)

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

KeyValuePrevalueEditor.cs

Cleaning up folder structure (U4-56)

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

KeyValuePrevalueEditor.css

Cleaning up folder structure (U4-56)

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

KeyValuePrevalueEditor.js

Cleaning up folder structure (U4-56)

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

packages.config

Updated to latest CDF version which contains some fixes.

2013-07-22 11:29:32 +10:00

PrevalueEditor.css

Cleaning up folder structure (U4-56)

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

PrevalueEditorExtensions.cs

Cleaning up folder structure (U4-56)

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

ResourceExtensions.cs

Cleaning up folder structure (U4-56)

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

umbraco.editorControls.csproj

Completes U4-2744 Remove very old TinyMCE 2 and all that is related to it

2013-08-29 17:45:16 +10:00

XmlData.cs

Cleaning up folder structure (U4-56)

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