Stephan
|
fe3b28261f
|
Deal with FIXMEs in persistence layer
|
2016-11-30 19:23:20 +01:00 |
|
Stephan
|
800b60ad68
|
Deal with FIXMEs
|
2016-11-30 18:32:22 +01:00 |
|
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
|
74604c69f9
|
Fix tests after merge
|
2016-11-25 14:08:23 +01:00 |
|
Stephan
|
8e056aba66
|
Merge origin/dev-v7.6 into dev-v8-zbwip (builds, not tested)
|
2016-11-23 10:33:12 +01:00 |
|
Stephan
|
35aac2cdec
|
Merge origin/dev-v7 into dev-v7.6
|
2016-11-18 09:52:45 +01:00 |
|
Shannon Deminick
|
78a2a4a55b
|
Merge pull request #1624 from umbraco/temp-u4-9195
U4-9195 - fix PetaPoco page of int
|
2016-11-17 17:06:02 +01:00 |
|
Sebastiaan Janssen
|
0a883ae109
|
Make sure Umbraco runs in Visual Studio 2017
|
2016-11-16 18:55:12 +01:00 |
|
Stephan
|
568a4987e3
|
U4-9195 - fix PetaPoco page of int
|
2016-11-16 17:51:00 +01:00 |
|
Warren Buckley
|
02bfe3ad72
|
Merge pull request #1603 from rjabreu/U4-9036
added finish button so page only reloads after user input. also added…
|
2016-11-16 16:14:53 +00:00 |
|
Stephan
|
27eaa8d4af
|
Inject filesystems into partial repositories
|
2016-11-16 15:19:15 +01:00 |
|
Shannon Deminick
|
3eba4f462f
|
Merge pull request #1619 from umbraco/temp-u4-6994
U4-6994 - N+1 queries
|
2016-11-16 13:46:22 +01:00 |
|
Shannon Deminick
|
55f3d72cc8
|
Merge pull request #1543 from umbraco/temp-u4-9108
U4-9018 - provide a way to disable server master election
|
2016-11-16 13:10:16 +01:00 |
|
Shannon Deminick
|
e0eb8473ee
|
Merge pull request #1454 from umbraco/dev-v7-deploy
U4-8909 - Merge dev-v7-deploy into dev-v7
|
2016-11-16 13:06:41 +01:00 |
|
Sebastiaan Janssen
|
2fa2cc1574
|
Merge pull request #1622 from umbraco/temp-U4-9188
U4-9188 Remove unnecessary duplicate index IX_cmsPropertyData
|
2016-11-16 10:18:21 +01:00 |
|
Stephan
|
7ea156d422
|
IEventMessagesFactory without HttpContext
|
2016-11-16 09:57:24 +01:00 |
|
Shannon
|
95f5773046
|
U4-9188 Remove unnecessary duplicate index IX_cmsPropertyData
|
2016-11-16 08:23:53 +01:00 |
|
Stephan
|
28fe2f7d22
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7-deploy
|
2016-11-15 18:43:14 +01:00 |
|
Stephan
|
289d7a01d8
|
Fix BulkInsert, was rolling back
|
2016-11-15 18:41:03 +01:00 |
|
Sebastiaan Janssen
|
47dbb648fb
|
Merge pull request #1614 from umbraco/temp-u4-9077
U4-9077 - relation type repository cache
|
2016-11-15 18:30:01 +01:00 |
|
Stephan
|
0478f01113
|
Fix merge
|
2016-11-15 14:08:30 +01:00 |
|
Stephan
|
ddf29c5875
|
Merge dev-v7.6 into dev-v7-deploy
|
2016-11-15 13:59:19 +01:00 |
|
Stephan
|
ad82270dcc
|
Merge branch origin/dev-v7 into dev-v7.6
|
2016-11-15 13:48:01 +01:00 |
|
Stephan
|
6c8a033a56
|
Fix build.bat
|
2016-11-15 13:46:49 +01:00 |
|
Stephan
|
e499f2d148
|
U4-9108 - add missing change
|
2016-11-15 13:44:44 +01:00 |
|
Stephan
|
62325f0a27
|
Merge branch origin/dev-v7 into temp-u4-9108
|
2016-11-15 13:34:13 +01:00 |
|
Shannon Deminick
|
ff499bff04
|
Merge pull request #1607 from umbraco/temp-u4-backport
U4-8909 backport from 7.6
|
2016-11-15 13:11:05 +01:00 |
|
Sebastiaan Janssen
|
26a04ca7e9
|
Merge pull request #1610 from umbraco/temp-U4-9134
U4-9134 XSS security issue in the grid
|
2016-11-15 12:56:21 +01:00 |
|
Claus
|
6f39439e3d
|
removing string.empty checks for attributes.
removing the redundant clean for outputting model.value in TextString.cshtml.
|
2016-11-15 12:10:36 +01:00 |
|
Claus
|
34d4b284fe
|
Merge pull request #1613 from umbraco/temp-U4-7833
U4-7833 Changing doc type results in invalid cache, lucene indexes, e…
|
2016-11-15 11:14:56 +01:00 |
|
Stephan
|
9d2fb0dd03
|
Fix after merges
|
2016-11-14 19:01:44 +01:00 |
|
Stephan
|
a5695b71eb
|
Merge pull request #1553 from umbraco/temp-U4-9105
U4-9105 SPIKE: Ensure our Lambda expression tree parsers at our service layer are not performance bottlenecks
|
2016-11-14 18:58:16 +01:00 |
|
Stephan
|
2b9ffdb6b9
|
Merge branch origin/dev-v7 into dev-v7-deploy
|
2016-11-14 18:53:53 +01:00 |
|
Stephan
|
539e7c80bf
|
Merge branch origin/dev-v7 into temp-U4-9105
|
2016-11-14 18:45:56 +01:00 |
|
Stephan
|
cfc1704c64
|
Fix build after merge
|
2016-11-14 18:33:16 +01:00 |
|
Stephan
|
bbe1cb1813
|
Merge branch origin/dev-v7 into temp-u4-6994
|
2016-11-14 18:31:36 +01:00 |
|
Stephan
|
feb120cbeb
|
Merge branch 'dev-v7' into temp-u4-6994
|
2016-11-14 18:20:06 +01:00 |
|
Stephan
|
2bc07ad4cc
|
Merge branch 'dev-v7' into temp-U4-9105
|
2016-11-14 18:13:45 +01:00 |
|
Sebastiaan Janssen
|
1c036b1a11
|
Merge pull request #1562 from umbraco/temp-u4-9136
Temp u4 9136
|
2016-11-14 18:04:37 +01:00 |
|