yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
6319b10881e01cd8549ca8b3be6e76cb56c54fcc
Umbraco-CMS/src/umbraco.editorControls
History
Shannon 6319b10881 Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/SQLCE4Umbraco/SqlCE4Umbraco.csproj
	src/SQLCE4Umbraco/app.config
	src/Umbraco.Core/app.config
	src/Umbraco.Tests/App.config
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/app.config
	src/umbraco.MacroEngines/App.Config
	src/umbraco.businesslogic/app.config
	src/umbraco.datalayer/app.config
	src/umbraco.editorControls/app.config
2014-07-23 10:08:01 -07: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
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-06 20:22:32 +11:00
folderbrowser
obsoleting legacy prop eds
2013-09-25 19:03:05 +10:00
imagecropper
Merge commit '874f464a2b51000920e2323f93bea116546e9b88' into 7.1.5
2014-07-10 11:53:45 +10: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
Replaced "retreive" with "retrieve".
2014-03-25 20:32:39 -07: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.1.0
2014-03-17 13:39:49 +11:00
PickerRelations
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
Properties
…
radiobuttonlist
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
relatedlinks
Fixes: U4-4777 Preview with related links property editor doesn't work - this is just a temp fix, ensures that the YSOD is not created but doesn't fix the way preview pages are created.
2014-04-29 13:46:32 +10: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
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-02-20 13:40:17 +11:00
userControlWrapper
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-02-20 13:40:17 +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
app.config
Merge remote-tracking branch 'origin/6.2.2' into 7.1.5
2014-07-23 10:08:01 -07: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
…
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
…
KeyValuePrevalueEditor.js
…
packages.config
Completes: U4-4457 Upgrade to latest CDF
2014-03-17 14:08:07 +11:00
PrevalueEditor.css
…
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.1.0
2014-03-17 14:15:14 +11:00
XmlData.cs
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00