Stephan
|
39f6d5dacc
|
Cleanup MapperCollectionBuilder init
|
2016-11-30 18:30:34 +01:00 |
|
Stephan
|
f4d9e73da7
|
Copy Compat7 DLL over to UI only in VS
|
2016-11-30 13:31:03 +01:00 |
|
Stephan
|
6313a65824
|
Define COMPAT7 in Release mode too, to copy the DLL over to UI
|
2016-11-30 11:59:55 +01:00 |
|
Stephan
|
e29f8bedb5
|
Fix tests
|
2016-11-29 19:05:36 +01:00 |
|
Sebastiaan Janssen
|
677cc74a61
|
Merge branch 'dev-v8' of https://github.com/umbraco/Umbraco-CMS into dev-v8
|
2016-11-29 18:02:49 +01:00 |
|
Sebastiaan Janssen
|
4855466b38
|
Merge remote-tracking branch 'origin/dev-v7.6' into dev-v8
# 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
|
2016-11-29 18:01:43 +01:00 |
|
Stephan
|
80503c92ce
|
Fix cmsContentNu table creation during install
|
2016-11-29 11:34:51 +01:00 |
|
Stephan
|
581f3d791f
|
Fix persistence layer refactoring
|
2016-11-29 11:31:38 +01:00 |
|
Stephan
|
6f91f8c2d7
|
Improve BootLoader logging in case of errors
|
2016-11-29 11:31:29 +01:00 |
|
Stephan
|
feea4430f6
|
Fix dependencies
|
2016-11-29 10:48:47 +01:00 |
|
Stephan
|
d407038141
|
Fix owin:AppStartup setting
|
2016-11-29 10:32:43 +01:00 |
|
Stephan
|
a49af20275
|
More persistence layer refactoring
|
2016-11-29 10:31:25 +01:00 |
|
Stephan
|
bdb6b48e3f
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6
|
2016-11-28 13:08:22 +01:00 |
|
Stephan
|
8305a1acd3
|
Merge pull request #1636 from umbraco/temp-U4-9222
U4-9222 The in memory XML cache is cloned everytime there is a content save even if there is nothing published
|
2016-11-28 13:06:11 +01:00 |
|
Stephan
|
309081cccf
|
Merge branch origin/dev-v7 into temp-U4-9222
|
2016-11-28 13:06:06 +01:00 |
|
Stephan
|
f97bc0fbb6
|
Merge origin/dev-v7 into dev-v7.6
|
2016-11-28 12:57:20 +01:00 |
|
Stephan
|
f7aee1c12f
|
Version 7.6.0-alpha031
|
2016-11-28 12:49:55 +01:00 |
|
Shannon
|
1221c0e416
|
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
|
2016-11-28 12:04:06 +01:00 |
|
Shannon
|
c505cc689b
|
Obsoletes access to ApplicationContext from UmbracoContext
|
2016-11-28 12:03:46 +01:00 |
|
Stephan
|
48dbd5c570
|
Ensure CacheRefresherEventHandler triggers first
|
2016-11-28 11:00:58 +01:00 |
|
Sebastiaan Janssen
|
51397d7c28
|
Merge branch 'dev-v7' into dev-v7.6
|
2016-11-28 10:49:37 +01:00 |
|
Shannon Deminick
|
69a8cb71ea
|
Merge pull request #1628 from umbraco/temp-u4-9201
temp-u4-9201
|
2016-11-28 10:42:37 +01:00 |
|
Stephan
|
184a01b64d
|
U4-9201 - fixes
|
2016-11-28 10:09:45 +01:00 |
|
Stephan
|
86cc3f69aa
|
Merge pull request #1637 from umbraco/temp-sqlhelper-usings
Refactor all usages of SqlHelper, ExecuteReader and ExecuteXmlReader …
|
2016-11-28 10:05:48 +01:00 |
|
Stephan
|
3a216c055e
|
U4-9222 - use HasPublishedVersion test
|
2016-11-28 09:52:45 +01:00 |
|
Sebastiaan Janssen
|
ee3a4614c3
|
Refactor all usages of SqlHelper, ExecuteReader and ExecuteXmlReader into using blocks
|
2016-11-26 18:02:57 +01:00 |
|
Stephan
|
bb9bc73daa
|
Merge remote-tracking branch 'origin/dev-v7' into temp-startuphandler-ordering
|
2016-11-25 18:53:58 +01:00 |
|
Shannon
|
5b5e1847eb
|
Updates legacy CMSNode and Document to use the PetaPoco Database intead of SqlHelper for the methods that the xml cache uses to update itself (so it's using one connection)
|
2016-11-25 18:08:18 +01:00 |
|
Shannon
|
eeb94e1668
|
U4-9222 The in memory XML cache is cloned everytime there is a content save even if there is nothing published
|
2016-11-25 18:07:27 +01:00 |
|
Shannon
|
14bf4bbd32
|
throws exception if the delegate is already set
|
2016-11-25 15:55:33 +01:00 |
|
Shannon
|
0e61d18b9e
|
Ensure core handlers are always first no matter what
|
2016-11-25 15:53:08 +01:00 |
|
Shannon
|
531fa9f25a
|
Ensures the delegate cannot be set once the event handlers are resolved.
|
2016-11-25 14:34:04 +01:00 |
|
Shannon
|
a44a670f50
|
Removed the IApplicationEventsFilter interface, adds a delegate property that can be set instead
|
2016-11-25 14:14:43 +01:00 |
|
Stephan
|
74604c69f9
|
Fix tests after merge
|
2016-11-25 14:08:23 +01:00 |
|
Shannon
|
81750c41bd
|
Removes events for filtering and instead use a special interface to perform the filtering, updates ctor for WeightAttribute to only accept positive numbers for public, internally it could be negative numbers, updates the filtering to always ensure that core handlers are at the beginning
|
2016-11-25 10:35:36 +01:00 |
|
Stephan
|
672568d1f5
|
Add missing file
|
2016-11-24 18:16:14 +01:00 |
|
Stephan
|
0179540023
|
Rename WeightAttribute, change default to 100, cleanup
|
2016-11-24 18:13:05 +01:00 |
|
Shannon
|
ed37b84b3b
|
makes public the WeightedPluginAttribute, uses this for resolving the startup handlers so they could be sorted, adds special event to allow modifying the startup handlers.
|
2016-11-24 11:20:01 +01:00 |
|
Stephan
|
0689bf4f31
|
U4-9201 - fix it all
|
2016-11-23 15:26:41 +01:00 |
|
Sebastiaan Janssen
|
47c8e6854e
|
Fixes: U4-9217 - Sanitize tags before storing them in the database
|
2016-11-23 14:24:26 +01:00 |
|
Stephan
|
3300dbbe5e
|
Merge branch 'dev-v7.6' into temp-u4-9201
|
2016-11-23 11:56:53 +01:00 |
|
Stephan
|
5784ea96e7
|
UnRevert "Backport SafeCallContext, DefaultDatabaseFactory fixes from 7.6"
This reverts commit 8ba6cb3abf.
|
2016-11-23 11:26:30 +01:00 |
|
Stephan
|
a77763ee89
|
Merge origin/dev-v7 into dev-v7.6
|
2016-11-23 11:03:52 +01:00 |
|
Stephan
|
1def61432e
|
U4-9216 - fix saving containers
|
2016-11-23 10:58:52 +01:00 |
|
Stephan
|
8e056aba66
|
Merge origin/dev-v7.6 into dev-v8-zbwip (builds, not tested)
|
2016-11-23 10:33:12 +01:00 |
|
Shannon
|
e9b2175506
|
Fixes null check problem in ExamineEvents.ContentTypeCacheRefresherCacheUpdated
|
2016-11-22 15:16:07 +01:00 |
|
Sebastiaan Janssen
|
a2a4ad3947
|
Fixes U4-9212
|
2016-11-22 14:31:29 +01:00 |
|
Sebastiaan Janssen
|
d95f818e43
|
Fixes U4-9212
|
2016-11-22 14:04:31 +01:00 |
|
Sebastiaan Janssen
|
64978dbe89
|
Merge pull request #1560 from mikkelhm/dev-v7
U4-9209 - Updates web.config.install.xdt to re-add the assemblyBinding for Html…
|
2016-11-21 22:54:49 +01:00 |
|
Sebastiaan Janssen
|
77e9643a09
|
Update NuGet CDF dependency
|
2016-11-21 08:17:18 +01:00 |
|