yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
80c1812bc8afad2335ac97ee9e9bf8d594240ce1
Umbraco-CMS/src/umbraco.editorControls
History
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
..
checkboxlist
obsoleting legacy prop eds
2013-09-25 19:03:05 +10:00
colorpicker
Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
2013-10-03 12:51:46 +10:00
datefieldmultiple
obsoleting legacy prop eds
2013-09-25 19:03:05 +10:00
datepicker
Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
2013-09-25 19:09:16 +10:00
dictionaryPicker
obsoleting legacy prop eds
2013-09-25 19:03:05 +10:00
dropdownlist
obsoleting legacy prop eds
2013-09-25 19:03:05 +10:00
folderbrowser
obsoleting legacy prop eds
2013-09-25 19:03:05 +10:00
imagecropper
turns off imagecropper toxml which has caused issues
2013-11-19 14:19:41 +01:00
label
obsoleting legacy prop eds
2013-09-25 19:03:05 +10:00
listbox
obsoleting legacy prop eds
2013-09-25 19:03:05 +10:00
macrocontainer
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
mediapicker
obsoleting legacy prop eds
2013-09-25 19:03:05 +10:00
memberpicker
obsoleting legacy prop eds
2013-09-25 19:03:05 +10:00
MultiNodeTreePicker
Fixes a unit test issue with the mntp editor initialization.
2013-12-16 16:27:59 +11:00
MultipleTextstring
obsoleting legacy prop eds
2013-09-25 19:03:05 +10:00
numberfield
obsoleting legacy prop eds
2013-09-25 19:03:05 +10:00
pagepicker
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
2013-12-19 11:41:03 +11:00
PickerRelations
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
Properties
Correcting SolutionInfo and AssemblyInfo, so assembly version is correct for all shipped assemblies
2012-11-26 07:46:29 -01:00
radiobuttonlist
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
relatedlinks
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
SettingControls
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
simpleEditor
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
Slider
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
tags
Completes: U4-3052 Create TagsService
2013-10-24 11:49:09 +11:00
textfield
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
textfieldmultiple
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
tinymce
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
tinyMCE3
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
ultimatepicker
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
uploadfield
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
userControlWrapper
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
wysiwyg
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
XPathCheckBoxList
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
XPathDropDownList
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
yesno
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
AbstractJsonPrevalueEditor.cs
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
AbstractOptions.cs
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
AbstractPrevalueEditor.cs
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
BaseDataType.cs
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
BaseTreePickerEditor.cs
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
CsvToXmlData.cs
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11: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
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
DefaultPrevalueEditor.cs
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
KeyValuePrevalueEditor.cs
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11: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
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
PrevalueEditor.css
Cleaning up folder structure (U4-56)
2012-06-22 20:39:48 +04:00
PrevalueEditorExtensions.cs
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
PropertyTypePicker.cs
merge
2013-11-07 17:16:22 +01:00
ResourceExtensions.cs
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
umbraco.editorControls.csproj
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
2014-01-13 14:08:23 +11:00
XmlData.cs
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00