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
leekelleher
2da5a522b0
Updated PublishedContent unit-test
...
to support the fix in commit 7a9a4a2fab
2018-07-18 10:56:31 +01:00
Shannon
390514cd9d
Merge remote-tracking branch 'origin/dev-v7' into temp8
...
# Conflicts:
# src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
# src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
# src/Umbraco.Core/Models/Identity/IdentityModelMappings.cs
# src/Umbraco.Core/Persistence/PetaPoco.cs
# src/Umbraco.Core/Persistence/PetaPocoSqlExtensions.cs
# src/Umbraco.Core/Security/BackOfficeUserManager.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Core/Services/FileService.cs
# src/Umbraco.Core/Services/IFileService.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
# src/Umbraco.Tests/FrontEnd/UmbracoHelperTests.cs
# src/Umbraco.Tests/Persistence/Querying/PetaPocoSqlTests.cs
# src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
# src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
# src/Umbraco.Web.UI.Client/src/less/property-editors.less
# src/Umbraco.Web.UI.Client/src/routes.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
# src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
# src/Umbraco.Web.UI.Client/src/views/content/copy.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
# 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.Client/src/views/users/user.controller.js
# src/Umbraco.Web.UI/config/splashes/noNodes.aspx
# src/Umbraco.Web.UI/config/umbracoSettings.Release.config
# src/Umbraco.Web.UI/config/umbracoSettings.config
# 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/fr.xml
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/MemberTypeController.cs
# src/Umbraco.Web/Editors/TemplateController.cs
# src/Umbraco.Web/PublishedContentExtensions.cs
# src/Umbraco.Web/Routing/PublishedContentRequest.cs
# src/Umbraco.Web/Routing/UrlProviderExtensions.cs
# src/Umbraco.Web/UmbracoHelper.cs
# src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
2018-07-18 13:19:14 +10:00
Sebastiaan Janssen
ca993187b0
Fixes unit tests after adding an extra node in the cache
2018-07-14 17:37:14 +02:00
Sebastiaan Janssen
861b2c61a8
Adds a few more test cases
2018-07-14 17:16:59 +02:00
Sebastiaan Janssen
9daae665e4
Adds unit tests for IsAncestor(OrSelf) and IsDescendant(OrSelf)
2018-07-14 17:09:02 +02:00
Shannon
41407d27d0
hopefully the last merge
2018-07-12 22:39:30 +10: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
Shannon Deminick
7132ccdd99
Merge pull request #2760 from umbraco/temp8-variants
...
Variants Refactoring [v8]
2018-07-10 13:05:13 +10:00
Stephan
f4983a2b21
Merge branch 'hackathon-remove-imediaserviceoperation' of https://github.com/AndyFelton/Umbraco-CMS into temp8-mediaserviceops
2018-07-09 11:49:56 +02:00
Stephan
ecf9a928d7
Refactor variations
2018-07-03 13:05:21 +02:00
Stephan
7a615133ff
Renormalize
2018-06-29 19:52:40 +02:00
Andy Felton
c56b983cd6
Merged methods from IMediaService to IMediaServiceOperations
...
Moved methods from IMediaServer to IMediaServiceOperations, fixed tests and other code which depends on these.
2018-06-29 14:18:11 +01:00
Sebastiaan Janssen
31965358c3
Removes unused class
2018-06-28 20:14:27 +02:00
Dan Booth
f083a33d92
U4 10778 - FirstChild<T> extension returns IPublishedContent rather than model of type T ( #2623 )
2018-06-28 20:09:54 +02:00
Shannon
3da120ce33
Adds Property Type to the published content model, fixes some web.config versions
2018-05-17 13:32:20 +02:00
Shannon
ee9f150483
Removes the AdditionalData properties for EntitySlim and moves them to real properties of IDocumentEntitySlim, renames PublishedCultureInfos to not be plural
2018-05-08 12:43:07 +10:00
Stephan
d56af5872d
Implement basic fallback plumbing (in progress)
2018-05-02 13:38:45 +02:00
Stephan
211267d500
Deal with FIXMEs
2018-05-02 09:31:30 +02:00
Stephan
ff7c74ec8a
Rename accessors
2018-04-30 21:29:49 +02:00
Stephan
dbf310caf1
Now use empty string for invariant in published
2018-04-30 21:03:43 +02:00
Stephan
038fc87a40
Cleanup, fix tests
2018-04-30 15:11:01 +02:00
Stephan
bcd0c95ec1
Refactor getting urls
2018-04-30 09:14:14 +02:00
Stephan
7dd1efb29f
Refactor content culture & variations
2018-04-30 09:14:14 +02:00
Stephan
6959e595f5
IPublishedContent.UrlSegment
2018-04-30 09:14:14 +02:00
Stephan
ce8775b3e7
Cleanup IPublishedContent
2018-04-30 09:14:13 +02:00
Stephan
923fdf9199
ISystemDefaultCultureAccessor
2018-04-30 09:13:21 +02:00
Stephan
908589277a
U4-11227 - default variations and fallback (wip)
2018-04-30 09:13:21 +02:00
Shannon
73567ffdce
Fixes IPublishedShapshot and friends
2018-04-27 11:38:50 +10:00
Shannon
ad6a745681
Changes CultureInfo to string where required, fixes tests
2018-04-27 11:08:20 +10:00
Shannon
e99c519032
Merge remote-tracking branch 'origin/temp8' into temp8-U4-11220
...
# Conflicts:
# src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.cs
2018-04-26 19:18:14 +10:00
Shannon
9044c9328d
Gets inbound routing working, reduces the amount of non injected dependencies, reduces the amount of DomainHelper instances
2018-04-24 13:07:18 +10:00
Shannon
48641166b9
WIP - gets 'inbound' routing working to generate culture specific URLs
2018-04-24 01:31:01 +10:00
Stephan
a69019aea0
From int languageId to string culture
2018-04-21 09:57:28 +02:00
Shannon
c90d6be8ab
U4-8861 Extract GlobalSettings to an interface and expose on the standard UmbracoConfig.For settings singleton including a bunch of cleanup, getting the installer and steps to be DI
2018-04-06 13:51:54 +10:00
Stephan
75966dcfbd
Merge branch origin/dev-v8 into dev-v8
2018-04-03 14:57:55 +02:00
Stephan
cdd064ba08
Upgrade Dependencies
2018-04-03 14:54:01 +02:00
Shannon
1719d33a48
Fixes tests, updates examine, fixes how __Path is stored
2018-04-03 12:33:21 +10:00
Shannon
c66365e11a
gets some tests working
2018-03-27 18:35:16 +11:00
Shannon
88d66cfb53
Examine v1.0.0 integration, it now builds! now to run tests and fixup
2018-03-27 18:14:21 +11:00
Stephan
39cc7add80
Rename Umbraco.Whatever2 editors
2018-03-19 18:39:34 +01:00
Stephan
c0439b3c4e
DataTypes refactoring - troubleshooting
2018-02-08 16:08:52 +01:00
Stephan
e60a5a4a83
DataType refactoring - in progress
2018-01-26 17:55:20 +01:00
Stephan
c3e6886ac0
DataType refactoring - in progress
2018-01-24 11:44:44 +01:00
Stephan
97a058b817
DataType refactoring
2018-01-20 12:31:42 +01:00
Stephan
b5856803e1
DataType refactoring preparation - Entity refactoring
2018-01-10 12:48:51 +01:00
Stephan
bbff74fa51
UnitOfWork RIP, troubleshoot and fix, tests
2017-12-18 17:02:15 +01:00
Stephan
e4b375f72d
UnitOfWork RIP, build tests
2017-12-15 11:19:03 +01:00
Stephan
b392d72bc2
Published variants - WIP
2017-12-06 11:51:35 +01:00
Stephan
aa25990681
Integer version ID, cleanup
2017-12-01 20:00:33 +01:00
