yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-v7.6' into dev-v8

Browse Source 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Core/DatabaseContext.cs
#	src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
#	src/Umbraco.Core/Persistence/PetaPoco.cs
#	src/Umbraco.Core/Persistence/UmbracoDatabase.cs
#	src/Umbraco.Core/Services/ContentTypeService.cs
#	src/Umbraco.Core/UmbracoApplicationBase.cs
#	src/Umbraco.Web.UI/packages.config
#	src/Umbraco.Web/Scheduling/LogScrubber.cs
#	src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
#	src/Umbraco.Web/Search/ExamineEvents.cs
#	src/Umbraco.Web/Strategies/ServerRegistrationEventHandler.cs
#	src/Umbraco.Web/UI/Controls/UmbracoControl.cs
#	src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/UmbracoModule.cs
#	src/Umbraco.Web/packages.config
#	src/Umbraco.Web/umbraco.presentation/content.cs
#	src/Umbraco.Web/umbraco.presentation/library.cs
#	src/Umbraco.Web/umbraco.presentation/macro.cs
#	src/Umbraco.Web/umbraco.presentation/template.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMacros.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/create/macroTasks.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/editMacro.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertMacro.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/PreValueExtensions.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/RelationTypeExtensions.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-Content.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-DataTypes.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-PreValues.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-UmbracoObjectType.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/TagsAutoCompleteHandler.ashx.cs
#	src/UmbracoExamine/DataServices/UmbracoContentService.cs
#	src/umbraco.businesslogic/BasePages/BasePage.cs
#	src/umbraco.businesslogic/Log.cs
#	src/umbraco.businesslogic/User.cs
#	src/umbraco.cms/businesslogic/CMSNode.cs
#	src/umbraco.cms/businesslogic/Content.cs
#	src/umbraco.cms/businesslogic/ContentType.cs
#	src/umbraco.cms/businesslogic/Dictionary.cs
#	src/umbraco.cms/businesslogic/Packager/Package.cs
#	src/umbraco.cms/businesslogic/Property/Property.cs
#	src/umbraco.cms/businesslogic/RecycleBin.cs
#	src/umbraco.cms/businesslogic/Tags/Tag.cs
#	src/umbraco.cms/businesslogic/datatype/BaseDataType.cs
#	src/umbraco.cms/businesslogic/datatype/DataEditorSettingsStorage.cs
#	src/umbraco.cms/businesslogic/datatype/DefaultData.cs
#	src/umbraco.cms/businesslogic/datatype/DefaultPreValueEditor.cs
#	src/umbraco.cms/businesslogic/datatype/PreValue.cs
#	src/umbraco.cms/businesslogic/datatype/PreValues.cs
#	src/umbraco.cms/businesslogic/macro/macroPropertyType.cs
#	src/umbraco.cms/businesslogic/member/Member.cs
#	src/umbraco.cms/businesslogic/member/MemberGroup.cs
#	src/umbraco.cms/businesslogic/propertytype/propertytype.cs
#	src/umbraco.cms/businesslogic/relation/Relation.cs
#	src/umbraco.cms/businesslogic/relation/RelationType.cs
#	src/umbraco.cms/businesslogic/template/Template.cs
#	src/umbraco.cms/businesslogic/web/Document.cs
#	src/umbraco.cms/businesslogic/web/DocumentType.cs
#	src/umbraco.cms/businesslogic/workflow/Notification.cs
#	src/umbraco.cms/packages.config
#	src/umbraco.datalayer/SqlHelpers/MySql/MySqlInstaller.cs
#	src/umbraco.editorControls/BaseDataType.cs
#	src/umbraco.editorControls/DefaultData.cs
#	src/umbraco.editorControls/DefaultDataKeyValue.cs
#	src/umbraco.editorControls/DefaultPrevalueEditor.cs
#	src/umbraco.editorControls/KeyValuePrevalueEditor.cs
#	src/umbraco.editorControls/PickerRelations/PickerRelationsDataEditor.cs
#	src/umbraco.editorControls/PickerRelations/PickerRelationsEventHandler.cs
#	src/umbraco.editorControls/SettingControls/Pickers/Field.cs
#	src/umbraco.editorControls/imagecropper/PrevalueEditor.cs
#	src/umbraco.editorControls/macrocontainer/PrevalueEditor.cs
#	src/umbraco.editorControls/mediapicker/MediaPickerPrevalueEditor.cs
#	src/umbraco.editorControls/memberpicker/memberPicker.cs
#	src/umbraco.editorControls/packages.config
#	src/umbraco.editorControls/tags/PrevalueEditor.cs
#	src/umbraco.editorControls/tinymce/tinyMCEPreValueConfigurator.cs
#	src/umbraco.editorControls/ultimatepicker/ultimatePickerPrevalueEditor.cs
#	src/umbraco.editorControls/umbraco.editorControls.csproj
#	src/umbraco.editorControls/uploadfield/uploadFieldPreValue.cs
#	src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs
This commit is contained in:
Sebastiaan Janssen
2016-11-29 18:01:43 +01:00
parent 74604c69f9
commit 4855466b38
43 changed files with 676 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/NuSpecs/UmbracoCms.Core.nuspec
View File

@@ -27,7 +27,7 @@
<dependency id="SharpZipLib" version="[0.86.0, 1.0.0)" />
<dependency id="MySql.Data" version="[6.9.8, 7.0.0)" />
<dependency id="xmlrpcnet" version="[2.5.0, 3.0.0)" />
<dependency id="ClientDependency" version="[1.9.1, 2.0.0)" />
<dependency id="ClientDependency" version="[1.9.2, 2.0.0)" />
<dependency id="ClientDependency-Mvc5" version="[1.8.0, 2.0.0)" />
<dependency id="AutoMapper" version="[4.2.1, 5.0.0)" />
<dependency id="LightInject" version="[4.0.8, 5.0.0)" />

2
build/NuSpecs/tools/Web.config.install.xdt
View File

@@ -335,7 +335,7 @@
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<dependentAssembly xdt:Transform="Insert">
<assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.4.9.0" newVersion="1.4.9.0" />
</dependentAssembly>