Stephan
|
ee24fb4ef7
|
Make Tests Green Again
|
2018-10-09 23:02:22 +02:00 |
|
elitsa
|
85309e8ce5
|
Merge branch 'temp8-I3089' of https://github.com/umbraco/Umbraco-CMS into temp8-I3089
|
2018-10-08 10:23:53 +02:00 |
|
elitsa
|
4bde59ed66
|
Translation clean up
|
2018-10-08 10:13:36 +02:00 |
|
elitsa
|
9ad65e5fa8
|
Deleting 'Task' related references and implementations
|
2018-10-08 10:08:04 +02:00 |
|
Stephan
|
2020c680d6
|
Merge branch temp8 into temp8-11502
|
2018-10-03 15:08:12 +02:00 |
|
Shannon
|
7196c855b2
|
Fixes tests
|
2018-10-02 15:19:01 +02:00 |
|
Stephan
|
8a29745b98
|
Merge branch temp8 into temp8-11502
|
2018-10-01 14:45:33 +02:00 |
|
Shannon Deminick
|
2db32ef347
|
Merge pull request #3052 from umbraco/temp8-IDocumentEntity-updates
IDocumentEntity updates
|
2018-09-27 19:41:53 +10:00 |
|
Sebastiaan Janssen
|
75ab692955
|
Merge branch 'umbplfest-hackathon-remove-obsolete-phase2' of https://github.com/AnthonyCogworks/Umbraco-CMS into AnthonyCogworks-umbplfest-hackathon-remove-obsolete-phase2
|
2018-09-25 22:06:04 +02:00 |
|
Stephan
|
14bd8a0851
|
Cleanup some DTOs
|
2018-09-25 18:05:14 +02:00 |
|
Stephan
|
c791050058
|
Denormalize variants for perfs
|
2018-09-25 16:55:00 +02:00 |
|
Stephan
|
3d19acb97e
|
Variants in EntityRepository
|
2018-09-25 12:01:38 +02:00 |
|
Shannon
|
a39e77d1cf
|
Gets culture publishing info in IDocumentEntitySlim and has the tree showing the correct publish state, but missing 'edited' flag since i think that requires yet-another-query
|
2018-09-21 15:49:37 +10:00 |
|
Shannon
|
19e4352243
|
Revert "making an attempt at a single SQL statement to get publish info for variants ... but failing, will revert"
This reverts commit c65480cf77.
|
2018-09-21 15:28:36 +10:00 |
|
Shannon
|
c65480cf77
|
making an attempt at a single SQL statement to get publish info for variants ... but failing, will revert
|
2018-09-21 12:28:29 +10:00 |
|
Shannon
|
448850b2d0
|
I may have figured out how to get publish information into the IDocumentEntitySlim
|
2018-09-21 01:21:52 +10:00 |
|
Shannon
|
539c882adb
|
Merge branch 'temp8' into temp8-IDocumentEntity-updates
|
2018-09-21 01:06:21 +10:00 |
|
Anthony
|
8cd0bc5f50
|
umbPLfest hackathon - Removed obsolete methods and properties.
|
2018-09-20 13:56:02 +01:00 |
|
Shannon
|
feeb1c56cf
|
wip for IDocumentEntitySlim changes
|
2018-09-20 14:58:15 +10:00 |
|
Stephan
|
97b726ba20
|
Fix listviews sorting
|
2018-09-19 17:50:43 +02:00 |
|
Shannon
|
479f38b141
|
attempting to fix sorting due to aliased column names
|
2018-09-19 16:24:31 +10:00 |
|
Shannon
|
82b2778a59
|
Merge branch 'temp8' into temp8-p188
|
2018-09-19 16:16:03 +10:00 |
|
Stephan
|
a0821cbc95
|
Refactor ordering in services to support listviews variants sorting
|
2018-09-18 11:53:33 +02:00 |
|
Stephan
|
25c87d76b8
|
Fix merge
|
2018-09-13 14:59:45 +02:00 |
|
Stephan
|
33af498f88
|
Merge branch origin/temp8-p103 into temp8-11502
|
2018-09-13 14:11:17 +02:00 |
|
Stephan
|
4cbd0d9178
|
Remove mandatory constraint on default language
|
2018-09-12 11:47:04 +02:00 |
|
Stephan
|
7a1744a38b
|
Merge branch temp8 into temp8-11502
|
2018-09-06 16:07:32 +02:00 |
|
Stephan
|
d9d51584ea
|
Fix merge
|
2018-09-06 14:10:26 +02:00 |
|
Stephan
|
c42f3a1158
|
Merge branch temp8 into temp8-11502
|
2018-08-31 08:43:11 +02:00 |
|
Stephan
|
eaacdc0514
|
Deal with fixmes in IContent IsCultureSomething
|
2018-08-28 15:11:13 +02:00 |
|
Warren
|
24f91f1917
|
Adds in Error without ex for just a message and a message template with params
|
2018-08-23 14:43:38 +01:00 |
|
Warren
|
9e996c68bb
|
Refactored the error params, so that exception is before the message/template so its more in sync with Serilog signature & was an easy way to find some more logs I missed too
|
2018-08-17 15:41:58 +01:00 |
|
Warren
|
47c8651609
|
Update more logging messages to use templates as opposed to string formats that were using the LoggerExtensions <T>
|
2018-08-16 12:00:12 +01:00 |
|
Warren
|
2a298aaaf5
|
FIRST PASS - Updates Umbraco.Core project to not use the func overload & to use new message template instead
|
2018-08-14 15:08:32 +01:00 |
|
Stephan
|
0928fc099d
|
Merge branch temp8 into temp8-11502
|
2018-07-31 15:34:42 +02:00 |
|
Shannon
|
a83ea47c25
|
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# build/NuSpecs/tools/Web.config.install.xdt
# src/Umbraco.Core/Constants-Conventions.cs
# src/Umbraco.Core/DatabaseContext.cs
# src/Umbraco.Core/Models/Rdbms/LanguageDto.cs
# src/Umbraco.Core/Models/Rdbms/RelationTypeDto.cs
# src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
# src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
# src/Umbraco.Core/PropertyEditors/PreValueField.cs
# src/Umbraco.Core/PropertyEditors/SupportTagsAttribute.cs
# src/Umbraco.Core/Services/FileService.cs
# src/Umbraco.Core/Services/IFileService.cs
# src/Umbraco.Core/Strategies/RelateOnTrashHandler.cs
# src/Umbraco.Tests/App.config
# src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs
# src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
# src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/umbgridselector.directive.js
# src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
# src/Umbraco.Web.UI.Client/src/less/belle.less
# src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less
# src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
# src/Umbraco.Web.UI.Client/src/less/hacks.less
# src/Umbraco.Web.UI.Client/src/less/property-editors.less
# src/Umbraco.Web.UI.Client/src/less/variables.less
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
# src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
# src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html
# src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
# src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.html
# src/Umbraco.Web.UI.Client/src/views/media/move.html
# src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html
# src/Umbraco.Web.UI/Views/Web.config
# src/Umbraco.Web.UI/umbraco/Install/Views/Web.config
# src/Umbraco.Web.UI/umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
# src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
# src/Umbraco.Web.UI/web.Template.Debug.config
# src/Umbraco.Web.UI/web.Template.config
# src/Umbraco.Web/Editors/TemplateController.cs
# src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
# src/Umbraco.Web/Models/ContentEditing/PreValueFieldDisplay.cs
# src/Umbraco.Web/PropertyEditors/ColorListPreValueEditor.cs
# src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ValueListPreValueEditor.cs
# src/Umbraco.Web/PublishedContentExtensions.cs
# src/Umbraco.Web/Trees/ApplicationTreeExtensions.cs
# src/Umbraco.Web/Trees/MediaTreeController.cs
# src/umbraco.MacroEngines/Resources/Web.config
# src/umbraco.cms/Actions/ActionRestore.cs
# src/umbraco.editorControls/yesno/YesNoDataType.cs
|
2018-07-30 21:31:35 +10:00 |
|
Sebastiaan Janssen
|
f63456a18f
|
Merge pull request #2552 from marcemarc/temp-U4-11163
Consider the 'case' of the Member Group/Role Name when comparing...
|
2018-07-25 14:40:08 +02:00 |
|
Stephan
|
053698baf6
|
Merge branch andyb/u4-11502 into temp8-11502
|
2018-07-23 15:12:52 +02:00 |
|
AndyButland
|
ecc75bc4c9
|
Allowed delete of langage via services even if used as a fall-back for other languages, by setting references to null before deleting
|
2018-07-21 08:24:08 +02:00 |
|
Stephan
|
b1ef9c5aa8
|
U4-11502 misc fixes
|
2018-07-18 12:27:14 +02:00 |
|
Stephan
|
b5dc538905
|
Merge branch 'u4-11502' of https://github.com/AndyButland/Umbraco-CMS into temp8-11502
|
2018-07-18 11:13:22 +02:00 |
|
Stephan
|
c7c1c7e8fa
|
Cleanup ISqlSyntaxProvider
|
2018-07-17 17:20:40 +02:00 |
|
AndyButland
|
91a0ee2c93
|
Refactored to object graph reference of fallback language to just use id
|
2018-07-12 20:52:02 +01:00 |
|
Shannon
|
7aa413d558
|
Merge remote-tracking branch 'origin/dev-v7' into temp8 (after fixing)
# Conflicts:
# build/Modules/Umbraco.Build/Build-UmbracoDocs.ps1
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Core/Constants-Applications.cs
# src/Umbraco.Core/Models/Rdbms/ConsentDto.cs
# src/Umbraco.Core/Persistence/DatabaseSchemaHelper.cs
# src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs
# src/Umbraco.Core/PropertyEditors/ValueConverters/GridValueConverter.cs
# src/Umbraco.Core/Services/ConsentService.cs
# src/Umbraco.Core/Services/IRelationService.cs
# src/Umbraco.Core/Services/RelationService.cs
# src/Umbraco.Tests/Plugins/PluginManagerTests.cs
# src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
# src/Umbraco.Tests/Services/ConsentServiceTests.cs
# src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
# src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
# src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
# src/Umbraco.Web.UI.Client/src/common/services/tree.service.js
# src/Umbraco.Web.UI.Client/src/less/application/grid.less
# src/Umbraco.Web.UI.Client/src/less/forms.less
# src/Umbraco.Web.UI.Client/src/less/main.less
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
# src/Umbraco.Web.UI.Client/src/views/components/html/umb-control-group.html
# src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
# src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js
# src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js
# src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
# src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html
# src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html
# src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js
# src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
# src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
# src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
# src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
# src/Umbraco.Web.UI/config/EmbeddedMedia.config
# src/Umbraco.Web.UI/config/trees.Release.config
# src/Umbraco.Web.UI/config/trees.config
# src/Umbraco.Web.UI/config/umbracoSettings.config
# src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
# src/Umbraco.Web.UI/umbraco/config/create/UI.xml
# src/Umbraco.Web.UI/umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/umbraco/config/lang/it.xml
# src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
# src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
# src/Umbraco.Web/Editors/BackOfficeController.cs
# src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
# src/Umbraco.Web/Editors/ContentTypeController.cs
# src/Umbraco.Web/Editors/MacroController.cs
# src/Umbraco.Web/Editors/MemberController.cs
# src/Umbraco.Web/Models/RegisterModel.cs
# src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ValueConverters/MacroContainerValueConverter.cs
# src/Umbraco.Web/PublishedContentExtensions.cs
# src/Umbraco.Web/Trees/ContentTreeController.cs
# src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web/Trees/TreeControllerBase.cs
# src/Umbraco.Web/UmbracoHelper.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx
# src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.designer.cs
|
2018-07-11 15:58:48 +10:00 |
|
AndyButland
|
53e96b25f6
|
Save of fall-back language on create and update of language
|
2018-07-08 16:14:57 +02:00 |
|
AndyButland
|
592de8bebc
|
Model, retrieval, mapping and display for fall back language editing
|
2018-07-08 16:14:47 +02:00 |
|
Stephan
|
0d3ea107c5
|
Deal with some FIXME
|
2018-07-04 10:41:08 +02:00 |
|
Stephan
|
b3696c29cc
|
Refactor Variants at service level
|
2018-07-04 08:59:50 +02:00 |
|
Stephan
|
ecf9a928d7
|
Refactor variations
|
2018-07-03 13:05:21 +02:00 |
|
Stephan
|
9c3e8b8e3c
|
Fix language inconsistencies management
|
2018-07-03 13:04:27 +02:00 |
|