yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,382 Commits 4 Branches 7 Tags
2baa1abfc4a7e4cec7f7773fa8f25943afbcb975
Commit Graph

44 Commits

Author SHA1 Message Date
Bjarke Berg
761c7dcfc6 Merge remote-tracking branch 'origin/v8/dev' into v9/dev 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Web.nuspec
#	src/Umbraco.Core/Dashboards/DashboardCollectionBuilder.cs
#	src/Umbraco.Examine/Umbraco.Examine.csproj
#	src/Umbraco.Examine/UmbracoExamineIndex.cs
#	src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
#	src/Umbraco.TestData/LoadTestController.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/CollectionBuildersTests.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web/Editors/KeepAliveController.cs
#	src/Umbraco.Web/Routing/PublishedContentNotFoundHandler.cs
 2021-05-21 12:32:39 +02:00
Chad Currie
474a76fd2b Use ContainsKey for Dictionaries. O(1) 2021-05-15 19:18:37 +10:00
Mole
bf41c2eeaa Netcore: Align namespaces (#9801) 
* Rename Umbraco.Core namespace to Umbraco.Cms.Core

* Move extension methods in core project to Umbraco.Extensions

* Move extension methods in core project to Umbraco.Extensions

* Rename Umbraco.Examine namespace to Umbraco.Cms.Examine

* Move examine extensions to Umbraco.Extensions namespace

* Reflect changed namespaces in Builder and fix unit tests

* Adjust namespace in Umbraco.ModelsBuilder.Embedded

* Adjust namespace in Umbraco.Persistence.SqlCe

* Adjust namespace in Umbraco.PublishedCache.NuCache

* Align namespaces in Umbraco.Web.BackOffice

* Align namespaces in Umbraco.Web.Common

* Ensure that SqlCeSupport is still enabled after changing the namespace

* Align namespaces in Umbraco.Web.Website

* Align namespaces in Umbraco.Web.UI.NetCore

* Align namespaces in Umbraco.Tests.Common

* Align namespaces in Umbraco.Tests.UnitTests

* Align namespaces in Umbraco.Tests.Integration

* Fix errors caused by changed namespaces

* Fix integration tests

* Undo the Umbraco.Examine.Lucene namespace change

This breaks integration tests on linux, since the namespace wont exists there because it's only used on windows.

* Fix merge

* Fix Merge
 2021-02-18 11:06:02 +01:00
Bjarke Berg
c88c842d47 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	.github/workflows/codeql-analysis.yml
#	src/Umbraco.Core/CompositionExtensions.cs
#	src/Umbraco.Core/Constants-AppSettings.cs
#	src/Umbraco.Core/GuidUdi.cs
#	src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
#	src/Umbraco.Core/PublishedContentExtensions.cs
#	src/Umbraco.Core/Routing/DefaultUrlProvider.cs
#	src/Umbraco.Core/Routing/UrlProvider.cs
#	src/Umbraco.Core/Routing/UrlProviderExtensions.cs
#	src/Umbraco.Core/Runtime/MainDom.cs
#	src/Umbraco.Core/Services/IRuntimeState.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
#	src/Umbraco.Core/Sync/DatabaseServerRegistrar.cs
#	src/Umbraco.Core/Sync/IServerRegistrar.cs
#	src/Umbraco.Infrastructure/Media/EmbedProviders/Instagram.cs
#	src/Umbraco.Infrastructure/Models/ContentBaseExtensions.cs
#	src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValue.cs
#	src/Umbraco.Tests/Misc/ApplicationUrlHelperTests.cs
#	src/Umbraco.Tests/Routing/UrlProviderTests.cs
#	src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
#	src/Umbraco.Tests/TestHelpers/TestObjects.cs
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
#	src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Rte.cshtml
#	src/Umbraco.Web/CompositionExtensions.cs
#	src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
#	src/Umbraco.Web/ImageCropperTemplateExtensions.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Runtime/WebInitialComponent.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
#	src/Umbraco.Web/UmbracoContext.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/UmbracoInjectedModule.cs
 2020-11-30 11:24:24 +01:00
Ronald Barendse
2bfef74191 Fix casing of 'URL' (#9080) 2020-10-05 20:48:38 +02:00
Bjarke Berg
90c2381c86 Renamed Umbraco.Abstractions to Umbraco.Core 2020-02-24 08:21:53 +01:00
Shannon
a1769dd937 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/media-tracking 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Core/Models/RelationType.cs
#	src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Web/UmbracoComponentRenderer.cs
 2019-12-18 15:28:27 +11:00
Warren Buckley
dc494ff525 MemberEntitySlim has the same properties as ContentEntitySlim so lets inherit it 2019-11-18 12:18:50 +00:00
Ronald Barendse
34008edd34 Fix issues with added PanicException 2019-11-15 09:15:12 +01:00
Shannon
3bd223669f Moves as much as possible from Models/Packaging, Models/PublishedContent, Models/Entities, Models/Membership 2019-11-14 16:19:24 +11:00
Shannon
12541e7e8f reverts changes to IUmbracoEntity, we don't need to query on the object type property 2019-11-06 13:22:12 +11:00
Shannon
602acce8f4 Gets entity repository to be able to return a mix of object types 2019-11-05 15:50:49 +11:00
Bjarke Berg
eade92e803 Merge remote-tracking branch 'origin/v8/dev' into vx/feature/unicore 
# Conflicts:
#	src/Umbraco.Core/ObjectExtensions.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
 2019-10-30 13:35:48 +01:00
Kenn Jacobsen
f6d00a177e V8: Support allowed types for MNTP member picker (#6524) 2019-10-14 14:34:33 +02:00
Ronald Barendse
6350c8c05b Removed usage of obsoleted WontImplementException 2019-10-06 11:55:02 +02:00
Bjarke Berg
9a2d309dbe Merge remote-tracking branch 'origin/v8/dev' into vx/feature/unicore 
# Conflicts:
#	src/Umbraco.Abstractions/EnumerableExtensions.cs
#	src/Umbraco.Abstractions/Models/Entities/EntityBase.cs
#	src/Umbraco.Core/Models/Member.cs
 2019-07-03 15:05:34 +02:00
Kenn Jacobsen
e5956e4955 V8: Don't cast IContent to Content in DocumentRepository (#4611) 2019-06-28 09:19:11 +02:00
Bjarke Berg
d05a4a4d5c Merge remote-tracking branch 'origin/v8/dev' into vx/feature/unicore 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/V_7_8_0/AddMediaVersionTable.cs
 2019-06-18 15:04:16 +02:00
Shannon
81077c2681 Gets the entity service returning a media's url property and allows this to be used in the media picker. 2019-06-13 23:39:36 +10:00
Bjarke Berg
ff71d89415 Moved more files and removed modelsbuilder from UI project 2019-05-27 08:57:57 +02:00
Shannon
a0506622b4 dirty tracking, entities, cloning moved 2019-05-20 18:23:22 +02:00
Stephan
88b0dccfa1 Fix TreeEntityPath 2019-02-08 09:02:27 +01:00
Bjarke Berg
fc6548d87b Fix issue where Id was not set when loading all entity paths 2019-02-07 09:56:14 +01:00
Shannon
92606e7122 Fixes up dirty tracking of cultures and published cultures the same way we handle that with other entities which uses observable collection events. This simplifies the dirty tracking logic and means we dont require lookup the original object, but now we need to figure out the fixme stuff 2019-02-06 16:10:20 +11:00
Stephan
bc987a825a Cleanup 2019-02-04 10:09:32 +01:00
Shannon
80165c3c0f Fixes allocations of property selectors, with nameof we save a bunch of both memory and initial reflection lookups 2019-02-04 19:52:04 +11:00
Chris Houston
78319bae9e Temp8 fix typos 2 (#4130) 2019-01-23 00:03:39 +01:00
Stephan
4a0b969777 Deal with fixme in Umbraco.Core 2019-01-21 16:01:37 +01:00
Shannon
42f0d2b356 Fixes dirty tracking with resetting properties 2018-10-25 15:47:25 +11:00
Stephan
9320c1a061 Cleanup variants dirty tracking 2018-10-23 15:38:47 +02:00
Shannon
cc4ee6527d Gets the correct variant logging put in to the audit trail, cleans up audit trail messages to make sense, makes sure audit trail is reloaded when changing variants 2018-10-19 13:24:36 +11:00
Shannon
b30f55ea30 Fixes issue of observable collections, event binding and deep cloning 2018-10-19 08:26:17 +11:00
Shannon
feeb1c56cf wip for IDocumentEntitySlim changes 2018-09-20 14:58:15 +10: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
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
Stephan
3f73452bc7 Various fixes, and U4-11287 2018-05-07 18:51:18 +02:00
Shannon
5a991c9424 Fixes Publishing/Unpublishing variants and it's nuances 2018-05-07 23:22:52 +10:00
Stephan
a2a4edb3be Port v7@2aa0dfb2c5 - WIP 2018-03-22 17:41:13 +01:00
Stephan
41948607d0 Port v7@2aa0dfb2c5 - WIP 2018-03-22 11:25:25 +01:00
Stephan
e2ea849211 Cleanup 2018-03-07 09:34:41 +01:00
Stephan
030c97ef26 Super user is not a Zero 2018-03-02 16:00:15 +01:00
Stephan
506d810cf6 DataType refactoring preparation - Entity refactoring 2018-01-15 15:54:06 +01:00
Stephan
cc47276095 DataType refactoring preparation - Entity refactoring 2018-01-15 13:44:49 +01:00
Stephan
d23933a5b1 DataType refactoring preparation - Entity refactoring 2018-01-15 13:28:35 +01:00