yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
c299edfe5a522834447b7d3916493f44d0ce1b23
Umbraco-CMS/src/umbraco.editorControls
History
Shannon 24e2547656 Merge branch 'u4-8632b' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-8632b 
# Conflicts:
#	src/Umbraco.Core/Models/Rdbms/UserGroup2NodePermissionDto.cs
#	src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaCreation.cs
#	src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/UserTypeRepository.cs
#	src/Umbraco.Core/Persistence/RepositoryFactory.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/SectionService.cs
#	src/Umbraco.Core/Services/UserService.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs
#	src/Umbraco.Tests/Services/ContentServiceTests.cs
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Web.UI/config/trees.config
#	src/Umbraco.Web.UI/umbraco/users/PermissionEditor.aspx
#	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
2017-05-04 18:29:43 +10: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
Refactor all usages of SqlHelper, ExecuteReader and ExecuteXmlReader into using blocks
2016-11-26 18:02:57 +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
Refactor all usages of SqlHelper, ExecuteReader and ExecuteXmlReader into using blocks
2016-11-26 18:02:57 +01:00
mediapicker
Updates everything to .Net 4.6.2, had to update the semver reference too - no breaking changes though
2017-02-07 00:22:34 +11:00
memberpicker
Refactor all usages of SqlHelper, ExecuteReader and ExecuteXmlReader into using blocks
2016-11-26 18:02:57 +01:00
MultiNodeTreePicker
U4-8868 Ensuring all usages of .live() is updated
2016-08-18 12:45:15 +02: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
Finds all other instances where a reader would be executed inside another reader's loop and fixes
2017-01-16 16:38:23 +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
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
Refactor all usages of SqlHelper, ExecuteReader and ExecuteXmlReader into using blocks
2016-11-26 18:02:57 +01: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
Refactor all usages of SqlHelper, ExecuteReader and ExecuteXmlReader into using blocks
2016-11-26 18:02:57 +01:00
textfield
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
textfieldmultiple
U4-7314 Change name of "Textbox Multiple" to "Large textbox" or "Textarea"
2015-10-29 13:54:16 +01:00
tinymce
Merge branch 'u4-8632b' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-8632b
2017-05-04 18:29:43 +10:00
tinyMCE3
Removed user types and migrated them to groups. Returned to compiling state.
2016-10-28 09:20:52 +02:00
ultimatepicker
Refactor all usages of SqlHelper, ExecuteReader and ExecuteXmlReader into using blocks
2016-11-26 18:02:57 +01:00
uploadfield
Refactor all usages of SqlHelper, ExecuteReader and ExecuteXmlReader into using blocks
2016-11-26 18:02:57 +01:00
userControlWrapper
Refactor all usages of SqlHelper, ExecuteReader and ExecuteXmlReader into using blocks
2016-11-26 18:02:57 +01: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
Updateing the app.configs with the correct redirects for log4net since alll package installs are going to change these
2017-04-07 12:04:05 +10:00
BaseDataType.cs
Refactor all usages of SqlHelper, ExecuteReader and ExecuteXmlReader into using blocks
2016-11-26 18:02:57 +01: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
Refactor all usages of SqlHelper, ExecuteReader and ExecuteXmlReader into using blocks
2016-11-26 18:02:57 +01:00
DefaultDataKeyValue.cs
Refactor all usages of SqlHelper, ExecuteReader and ExecuteXmlReader into using blocks
2016-11-26 18:02:57 +01:00
DefaultPrevalueEditor.cs
Refactor all usages of SqlHelper, ExecuteReader and ExecuteXmlReader into using blocks
2016-11-26 18:02:57 +01:00
KeyValuePrevalueEditor.cs
Refactor all usages of SqlHelper, ExecuteReader and ExecuteXmlReader into using blocks
2016-11-26 18:02:57 +01:00
KeyValuePrevalueEditor.css
…
KeyValuePrevalueEditor.js
…
packages.config
updates cdf version
2016-11-18 14:34:31 +01: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
deploy-257 Downgrade Core and Deploy to framework 4.5
2017-03-08 11:20:48 +01:00
umbraco.editorControls.csproj.DotSettings
Makes sure that R# doesn't suggest C#6 features
2015-07-24 17:25:52 +02:00
XmlData.cs
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00