Stephan
e44ed00c97
Another fallback iteration
2018-10-03 10:31:35 +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
612c38654d
Merge branch origin/dev-v7 into temp8
2018-09-06 13:07:09 +02:00
Sebastiaan Janssen
49df6e7c9d
Merge branch 'U4-8550' of https://github.com/drpeck/Umbraco-CMS into drpeck-U4-8550
...
# Conflicts:
# src/Umbraco.Web.UI/config/umbracoSettings.config
# src/Umbraco.Web/PublishedContentExtensions.cs
2018-08-26 17:45:34 +02:00
Stephan
0928fc099d
Merge branch temp8 into temp8-11502
2018-07-31 15:34:42 +02:00
Stephan
c209bdde5b
Fix routing, AliasUrlProvider
2018-07-31 14:48:30 +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
Stephan
a35f67ecef
Refactoring
2018-07-24 15:04:30 +02:00
Stephan
053698baf6
Merge branch andyb/u4-11502 into temp8-11502
2018-07-23 15:12:52 +02:00
AndyButland
1be74589f2
Combined fallback parameters into an array that defines methods and priority to be used.
2018-07-21 15:58:49 +02:00
AndyButland
695f21eadb
Removed unnecessary loop in looking up value from a fall-back language.
...
Put in a check to abort fall-back if there's a loop in language fall-backs.
2018-07-21 09:41:07 +02:00
leekelleher
7a9a4a2fab
Fixes bug with comparing partial content paths
...
Raised here in a comment by @coolmikkel
https://github.com/umbraco/Umbraco-CMS/pull/2253#issuecomment-405751083
2018-07-18 10:54:19 +01: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
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
Lee Kelleher
abf61417ad
U4-10561 - Performance improvement for IsAncestor/IsDescendant extension methods ( #2768 )
2018-07-16 10:44:54 +02:00
AndyButland
aadd843c33
Implemented published value fall back via language
2018-07-08 16:14:58 +02:00
Stephan
ecf9a928d7
Refactor variations
2018-07-03 13:05:21 +02:00
Stephan
a697608529
Fix un/publishing with variants + urls
2018-07-03 13:05:20 +02:00
Stephan
7a615133ff
Renormalize
2018-06-29 19:52:40 +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
b22ee9255d
Fixes FirstChild method
2018-06-20 21:07:01 +10:00
Sebastiaan Janssen
9008e6af88
Merge branch 'dev-v7' into temp8
...
# Conflicts:
# docs/CONTRIBUTING_DETAILED.md
# docs/README.md
# src/Umbraco.Core/Configuration/GlobalSettings.cs
# src/Umbraco.Core/StringExtensions.cs
# src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js
# src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
# src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html
# src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardvideos.html
# src/Umbraco.Web.UI.Client/src/views/prevalueeditors/boolean.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
# src/Umbraco.Web/PublishedContentExtensions.cs
# src/Umbraco.Web/Trees/LanguageTreeController.cs
2018-06-06 21:15:11 +02:00
Maarten Kieft
8e7630cd9c
Make Base AnchestorOrSelf function public
...
By making this function public, developers can use it to iterate over the tree on different property / function than the ones which are created. It makes umbraco easier to extend. Now we have to copy existing code in order to do this.
2018-05-17 12:09:15 +02:00
Stephan
6051891280
Fixes
2018-05-08 11:06:07 +02:00
Shannon
85c739aed4
Merge branch 'temp8-U4-11227' into temp8-U4-11282
...
# Conflicts:
# src/Umbraco.Core/Models/ContentBase.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
# src/Umbraco.Tests/Services/EntityServiceTests.cs
# src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs
# src/Umbraco.Web/PublishedContentExtensions.cs
# src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
2018-05-08 12:31:03 +10:00
Shannon
0e19ec7495
Fixes logic for determining if a domain is published and fixes logic for getting a url name for a variant taking into account it's published status
2018-05-08 11:21:14 +10:00
Stephan
d56af5872d
Implement basic fallback plumbing (in progress)
2018-05-02 13:38:45 +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
ce8775b3e7
Cleanup IPublishedContent
2018-04-30 09:14:13 +02:00
Stephan
27390afe86
All tests green
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
a26d7747b6
removes commented out code
2018-04-30 15:51:05 +10:00
Stephan
dbf1b1e0d4
Refactor DomainHelper
2018-04-27 17:54:49 +02:00
Shannon
ad6a745681
Changes CultureInfo to string where required, fixes tests
2018-04-27 11:08:20 +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
10dec4115d
Updates to latest examine and replaces IExamineIndexCollectionAccessor since we now have IExamineManager
2018-03-29 16:42:11 +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
b5856803e1
DataType refactoring preparation - Entity refactoring
2018-01-10 12:48:51 +01:00
Stephan
b392d72bc2
Published variants - WIP
2017-12-06 11:51:35 +01:00
Stephan
1c96df83cd
Port 7.7 - WIP
2017-09-08 19:39:13 +02:00
Shannon
59db5b0081
Obsoletes more dynamic published content extension methods and models
2017-08-01 17:04:16 +10:00
Stephan
a0fe56ee7c
Rename UmbracoExamine to Umbraco.Examine
2017-07-27 12:01:38 +02:00
Stephan
83f84f05b9
PropertyValueConverter - refactoring WIP
2017-07-25 13:57:42 +02:00
Stephan
c31cbf6b6d
PropertySet - rename and refactor
2017-07-24 12:39:35 +02:00
Stephan
c0eaeb3168
Fix tests with issues
2017-07-21 13:06:23 +02:00
Stephan
c76403077f
Normalize cr/lf/tab
2017-07-20 11:21:28 +02:00
Stephan
d57de05453
U4-10128 - super improve
2017-07-19 12:24:00 +02:00
Stephan
11e4bf5de8
U4-10128 - improve
2017-07-19 12:08:31 +02:00
