yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,871 Commits 4 Branches 7 Tags
6371fdbf4dd5ea2b897f1d24f84b3a855e302f95
Commit Graph

68 Commits

Author SHA1 Message Date
Bjarke Berg
6371fdbf4d post merge 2020-08-17 11:43:04 +02:00
Bjarke Berg
c57c42d2ec Fixes merge conflicts 2020-08-07 14:00:56 +02:00
Bjarke Berg
39162f0f6a Merge conflicts resolved 2020-08-06 12:59:21 +02:00
Bjarke Berg
adb38dceb5 Merge remote-tracking branch 'origin/netcore/feature/contentcontroller_and_related' into netcore/feature/remaining-backoffice-controllers 2020-06-28 14:00:26 +02:00
Bjarke Berg
9d639a64b3 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Core/Templates/IUmbracoComponentRenderer.cs
#	src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
 2020-06-28 13:35:25 +02:00
Bjarke Berg
2ffb01530a Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Core/Models/PublishedContent/IndexedArrayItem.cs
#	src/Umbraco.Infrastructure/Models/Mapping/CommonMapper.cs
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web/Compose/AuditEventsComponent.cs
#	src/Umbraco.Web/HtmlHelperRenderExtensions.cs
#	src/Umbraco.Web/HtmlStringUtilities.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
 2020-06-28 12:48:19 +02:00
Bjarke Berg
1a05feac02 Clean up 2020-06-25 15:23:11 +02:00
Bjarke Berg
1594a84d80 migated remaining backoffice controllers 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-22 10:08:08 +02:00
Bjarke Berg
fe7d4ed3e9 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-remaining-trees 2020-06-17 18:05:40 +02:00
Bjarke Berg
a6b23fbfa0 Entity controller migrated 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-15 13:07:49 +02:00
Bjarke Berg
cf7ed273d7 Fix import/export 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-15 08:52:03 +02:00
Bjarke Berg
e8c0a08ea8 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-remaining-trees 2020-06-11 15:21:51 +02:00
Bjarke Berg
918e7f1be3 Merge branch 'netcore/dev' into netcore/netcore 2020-06-11 15:17:42 +02:00
Bjarke Berg
d77c3dc8dd Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-06-11 15:16:39 +02:00
Bjarke Berg
835b04273f Migrated remaining *TreeController's 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-10 19:22:25 +02:00
Elitsa Marinovska
42fba97af9 Removing the need of requesting umbracoContext to get the web security service 2020-06-04 13:53:06 +02:00
Shannon Deminick
a7a463c7d4 Merge pull request #8183 from umbraco/netcore/feature/identity 
Back office identity changes and cookie authentication
 2020-06-03 12:55:57 +10:00
Bjarke Berg
58c70c3a90 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/en_us.xml
 2020-05-29 13:02:27 +02:00
Bjarke Berg
dca04b3dd7 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
#	src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs
#	src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
#	src/Umbraco.Web/Models/Trees/MenuItemList.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/Trees/RelationTypeTreeController.cs
#	src/Umbraco.Web/UmbracoApplication.cs
 2020-05-29 12:59:42 +02:00
Bjarke Berg
bfff08e98e https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Build fix 2020-05-27 12:38:53 +02:00
Bjarke Berg
28c4f87236 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6586 - Migrated ImageUrlGeneratorController + Made usage some strings into the enums in the ImageUrlGenerationOptions 2020-05-20 17:39:07 +02:00
Shannon
057aa9bc66 Move more models: template, macro, ObjectTypes 2020-05-20 12:10:17 +10:00
Shannon
8134a35fe0 Moves ContentType, MemberType, MediaType, etc... less casting, less internals 2020-05-20 11:59:41 +10:00
Shannon
d444dfd441 Moves ContentTypeBase, Member, ContentTypeComposition, etc... removes the casting 2020-05-20 11:33:10 +10:00
Shannon
9e8bfd039e Ensures the correct version of Microsoft.AspNet.Identity.Core is used consistently, moves Media 2020-05-20 11:01:45 +10:00
Shannon
3f67e1be7d Move Content, Property, PropertyCollection, PropertyType 2020-05-20 10:50:37 +10:00
Shannon
7bea165597 Moves UserGroup and UserGroupExtensions to core 2020-05-20 10:37:11 +10:00
Shannon
86f60677a1 moves UserExtensions and ContentPermissionsHelper 2020-05-20 10:29:53 +10:00
Shannon
96e006e8b9 Moves user to Core models and removes backwards compat hacks and casting 2020-05-20 10:22:48 +10:00
Bjarke Berg
3c622905ba Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Infrastructure/Models/Mapping/ContentTypeMapDefinition.cs
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
 2020-05-11 08:23:59 +02:00
Shannon
7e2d0902af Huge IIOHelper cleanup, removes some overlap with IHostingEnvironment, much less usages of IIOHelper and instead just use what is already available on IHostingEnvironment 2020-04-03 11:03:06 +11:00
Andy Butland
f48a4b0c72 Merge branch 'netcore/dev' into feature/7540-use-image-url-generator-back-office 2020-03-27 21:20:08 +01:00
Bjarke Berg
44e9df949d Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Infrastructure/Models/Property.cs
#	src/Umbraco.Tests/Models/ContentTests.cs
 2020-03-26 19:22:09 +01:00
Andy Butland
b67c3dfa04 Moved IImageUrlGenerator and implementation into more appropriate enamespace 2020-03-24 09:37:46 +01:00
Bjarke Berg
73a1058dd1 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Models/Property.cs
 2020-03-23 12:48:56 +01:00
Bjarke Berg
f671fea998 NetCore: Refactor config/setting to not use dependencies (#7810) 
* Avoid usage of IOHelper in GlobalSettings

* Avoid usage of IOHelper in ModelsBuilderConfig.cs

* Avoid usage of IOHelper in ConnectionStrings.cs

* Simplified more config

* Fix for ModelsBuilderConfig

* Moved GetUmbracoMvcAreaNoCache to IOHelperExtensions
 2020-03-17 16:26:56 +01:00
Bjarke Berg
c486444eda Cleaned up config for Content settings 2020-03-12 15:30:22 +01:00
Bjarke Berg
cb0994a929 Cleaned up config for Security settings 2020-03-12 14:36:25 +01:00
Bjarke Berg
9d6762fb6a Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Models/PropertyType.cs
#	src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
#	src/Umbraco.Infrastructure/Models/Mapping/EntityMapDefinition.cs
#	src/Umbraco.Tests/Models/PropertyTypeTests.cs
 2020-03-10 08:25:43 +01:00
Bjarke Berg
8d76499969 Separated TreeNode stuff from the commonMapper to allow move of more mappers 2020-02-26 10:33:05 +01:00
elitsa
0a130d6bbd Removing MacroType enum as we only have one type - PartialView. Refactoring all its references and fixing tests 2020-02-25 13:38:36 +01:00
Bjarke Berg
d1c39a813a Merge branch 'netcore/dev' into netcore/feature/move-mappings-after-httpcontext 
# Conflicts:
#	src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
#	src/Umbraco.Web/Install/InstallHelper.cs
 2020-02-20 08:46:54 +01:00
Shannon Deminick
ba2c0da379 Merge pull request #7646 from AndyButland/netcore/fix-circular-dependency-data-type-repository 
Removed circular dependency between data type service and repository
 2020-02-20 18:11:01 +11:00
Bjarke Berg
ca4f0a8057 Merge branch 'netcore/feature/move-files-after-umbraco-context-abstractions' into netcore/feature/move-mappings-after-httpcontext 
# Conflicts:
#	src/Umbraco.Web/Install/InstallHelper.cs
#	src/Umbraco.Web/Models/Mapping/CommonMapper.cs
 2020-02-19 11:40:25 +01:00
Shannon
13a56eb085 Renames and refactors the MediaUrlGeneratorCollection and ensure that this collection is used wherever IMediaUrlGenerator is needed instead of relying property editors possibly being the implementation. 2020-02-19 16:37:00 +11:00
Bjarke Berg
402867f115 Moved lots of mapping files 2020-02-17 09:15:48 +01:00
Bjarke Berg
392828fcb2 Merge branch 'netcore/feature/use-request-cache-instead-of-httpcontext-items' into netcore/feature/move-files-after-umbraco-context-abstractions 2020-02-13 12:28:50 +01:00
Benjamin Carleski
bcd26b9243 Merge remote-tracking branch 'umbraco/temp-7538-image-url-generator' into netcore/dev 
# Conflicts:
#	src/Umbraco.Abstractions/IImageUrlGenerator.cs
#	src/Umbraco.Abstractions/ImageUrlGenerationOptions.cs
#	src/Umbraco.Core/Composing/Current.cs
#	src/Umbraco.Core/Models/UserExtensions.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValue.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Tests/Runtimes/StandaloneTests.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
 2020-02-11 16:53:13 -08:00
Andy Butland
927b7c0f75 Removed circular dependency between data type service and repository, by moving the creation of labels for missing property editors to the service. 2020-02-11 23:17:39 +01:00
Andy Butland
0c0b94b10f Migrate various extension methods on IPublishedContent, IPublishedElement and IPublishedProperty to Umbraco.Abstractions 2020-02-08 10:02:33 +01:00