yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,839 Commits 4 Branches 7 Tags
ea300f61ce01948d7e2e86eec773a4aaab484e1f
Commit Graph

152 Commits

Author SHA1 Message Date
Bjarke Berg
e2dfc68718 Cleaned up config for WebRouting settings 2020-03-12 09:52:34 +01:00
Bjarke Berg
e9f7034365 Moved compoenents and composers 2020-03-03 07:29:51 +01: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
Bjarke Berg
b964ff1d3e Introduced an extension method on IHttpContextAccessor that return the HttpContext or throws if null. 2020-02-19 10:18:27 +01:00
Bjarke Berg
750b6f6a18 Move more files and fixed circular dependency 2020-02-19 09:29:10 +01:00
Bjarke Berg
dceb6c80f5 Merge branch 'netcore/feature/AB4919-untable-umbraco-context' into netcore/feature/move-files-after-umbraco-context-abstractions 
# Conflicts:
#	src/Umbraco.Web/Security/WebSecurity.cs
#	src/Umbraco.Web/UmbracoContextFactory.cs
 2020-02-14 09:00:50 +01:00
Bjarke Berg
6ccd63694d Fix merge issue 2020-02-14 08:51:17 +01:00
Bjarke Berg
293a5fbe33 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB4919-untable-umbraco-context 
# Conflicts:
#	src/Umbraco.Web/Templates/TemplateRenderer.cs
 2020-02-14 08:34:04 +01:00
Bjarke Berg
b57a7690f5 Moved More files to infrastructure/abstractions 2020-02-13 11:21:20 +01:00
Bjarke Berg
6c395db5a5 Removed legacy way of handling alternative templates.. Today we use ContentFinderByUrlAndTemplate 2020-02-12 10:56:23 +01:00
Bjarke Berg
e94921b384 Introduced interface on PublishedRequest and moved interfaces to abstractions 2020-02-10 19:23:42 +01:00
Bjarke Berg
d151503dbf Started replacing UmbracoContext.HttpContext with injection of IHttpContextAccessor 2020-02-10 14:22:18 +01:00
Bjarke Berg
5784449fce Started replacing UmbracoContext.HttpContext with injection of IHttpContextAccessor 2020-02-10 07:03:50 +01:00
Bjarke Berg
35a736e6cd Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/IO/SystemDirectories.cs
#	src/Umbraco.Core/Udi.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
 2020-02-07 10:04:28 +01:00
Sebastiaan Janssen
d285d40578 That safeguard unfortunately broke all the tests 2020-02-06 17:52:36 +01:00
Sebastiaan Janssen
fbd95f1c8e Fixes problem with #7530 where UmbracoContext is empty when HtmlImageSourceParser gets initialized 2020-02-06 15:10:05 +01:00
Bjarke Berg
03f1faf20d Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Web/Editors/UsersController.cs
#	src/Umbraco.Web/Models/ChangingPasswordModel.cs
#	src/Umbraco.Web/Templates/HtmlImageSourceParser.cs
 2020-01-29 09:22:45 +01:00
Aleksandr Šmailov
537674a0b3 Improve RTE performance when using base64 images (#7530) 2020-01-29 08:53:08 +01:00
Bjarke Berg
39b7cb4201 AB4375 - Moved Tour to Umbraco.Abstractions 2020-01-08 13:35:05 +01:00
Andy Butland
bd5b344a57 Merge branch 'netcore/dev' into feature/7371-short-string-helper 
# Conflicts:
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Core/TypeExtensions.cs
#	src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs
#	src/Umbraco.Infrastructure/Persistence/Factories/DataTypeFactory.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DataTypeRepository.cs
#	src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
#	src/Umbraco.ModelsBuilder.Embedded/UmbracoServices.cs
#	src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
#	src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
#	src/Umbraco.Tests/Strings/StringExtensionsTests.cs
#	src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
#	src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
#	src/Umbraco.Web/Editors/CodeFileController.cs
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/ContentControllerBase.cs
#	src/Umbraco.Web/Editors/ContentTypeController.cs
#	src/Umbraco.Web/Editors/CurrentUserController.cs
#	src/Umbraco.Web/Editors/DashboardController.cs
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Editors/MacroRenderingController.cs
#	src/Umbraco.Web/Editors/MacrosController.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/Editors/MemberController.cs
#	src/Umbraco.Web/Editors/RelationTypeController.cs
#	src/Umbraco.Web/Editors/TinyMceController.cs
#	src/Umbraco.Web/Editors/UsersController.cs
#	src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
#	src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs
#	src/Umbraco.Web/Mvc/RenderRouteHandler.cs
#	src/Umbraco.Web/PropertyEditors/RichTextEditorPastedImages.cs
#	src/Umbraco.Web/Runtime/WebInitialComponent.cs
#	src/Umbraco.Web/Templates/TemplateRenderer.cs
 2019-12-24 09:08:47 +01:00
Andy Butland
d469a2153b Removed (almost) all instances of Current.ShortStringHlper and replaced with constructor injection. 2019-12-20 17:36:44 +01:00
Bjarke Berg
7f9fbe9877 AB4227 - Removed StringExtensions from core.. 2019-12-18 18:55:00 +01:00
Bjarke Berg
aa15f89275 Merge remote-tracking branch 'origin/v8/feature/media-tracking' into netcore/dev 
# Conflicts:
#	src/Umbraco.Abstractions/Models/IDataValueEditor.cs
#	src/Umbraco.Abstractions/Models/RelationType.cs
#	src/Umbraco.Core/Contants-UdiEntityType.cs
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Core/Udi.cs
#	src/Umbraco.Tests/Models/RelationTests.cs
#	src/Umbraco.Tests/Models/RelationTypeTests.cs
#	src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Tests/Published/NestedContentTests.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
#	src/Umbraco.Web/UmbracoComponentRenderer.cs
 2019-12-10 14:44:42 +01:00
Shannon
c58c31c6bd Split Udi into UdiParser & UdiParserServiceConnectors, remove GuidUdi and StringUdi Parse methods (makes no sense), adds generic parse method to UdiParser, simplifies tests, removes Current usage 2019-11-13 16:33:40 +11:00
Bjarke Berg
13507c0e13 AB3653 - Static IOHelper -> IIOHelper (Moved into Current as a first step 😭) 2019-11-08 07:51:14 +01:00
Bjarke Berg
63bfc4c2c0 Move constants 2019-11-05 14:55:42 +01:00
Bjarke Berg
befcabfced Move constants 2019-11-05 13:28:26 +01:00
Shannon
70ccee302d Renames/moves some stuff and adds test to show auto relation tracking 2019-10-25 15:08:56 +11:00
Shannon
9303a49732 Moves the copy/paste rte stuff to a separate service, injects lazy property editors and relation service into the base content repositories 2019-10-23 19:08:03 +11:00
Shannon
c831c9de53 uses nameof in attributes 2019-10-23 16:30:22 +11:00
Shannon
17fd09fe3d Naming 2019-10-23 14:55:18 +11:00
Shannon
1adf5a30f3 Renames some stuff, updates RTE editor to return media/content refs and adds tests for locallink parsing 2019-10-22 15:48:47 +11:00
Shannon
6bb8a15a87 Adds UdiParserTests 2019-10-22 15:07:01 +11:00
Shannon
bb2a3a5e3d stub class for udi parser 2019-10-22 11:09:21 +11:00
Shannon
f8e04eb1d6 Adds tests for MediaParser and simplifies UmbracoContext mocking 2019-10-22 00:53:52 +11:00
Shannon
4f9e0fcb92 No more using TemplateUtilities 2019-10-21 23:53:14 +11:00
Shannon
a78a4ff807 Less statics, new InternalLinkParserTests, better testing support on UDI, less singletons 2019-10-21 22:56:02 +11:00
Warren Buckley
0aab19f201 Merge branch 'v8/dev' into v8/bugfix/AB2734-Image-Deletion-Bug 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
 2019-09-24 13:46:02 +01:00
Warren Buckley
7404ccf024 C# change to append/perist the width & height into the pasted/dragged image to the image src url for ImageProcessor resizing 2019-09-23 14:47:41 +01:00
Warren Buckley
1b4fdf1757 Update FindAndPersistPastedTempImages method to deal with duplicate images in the same RTE to only upload it once 2019-09-20 12:51:06 +01:00
Warren Buckley
519fcab087 Use the recrusive feature bool of Directory.Delete to delete the file at the same time :) 2019-09-17 09:25:26 +01:00
Warren Buckley
df6da16161 Merge branch 'v8/dev' into v8/feature/2438AB-RTE-Image-Config-MediaFolder 
# Conflicts:
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
 2019-09-13 09:51:53 +01:00
Warren Buckley
c4026fb92f Inject all the things - aka make sure Shan doesn't poke with a sharp pointy stick for using Current 2019-09-12 14:54:21 +01:00
Warren Buckley
0d0abca255 Move the general cleanup of the App_Data/TEMP/FileUploads folder for one day+ old files 2019-09-12 14:35:45 +01:00
Warren Buckley
f6e9fb2845 Adds same code loop as FileUploadCleanupFilterAttribute to delete files 2019-09-12 14:27:22 +01:00
Warren Buckley
54a3bd07d7 Logic to use -1 Media root folder if no media folder is picked on the configuration of the RTE or the Grid 2019-09-11 14:24:52 +01:00
Warren Buckley
496ae724b4 Merge branch 'v8/feature/2349AB-RTE-Image-Upload' into v8/feature/2438AB-RTE-Image-Config-MediaFolder 
# Conflicts:
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
 2019-09-11 12:20:27 +01:00
Warren Buckley
f07be7df1c Usa a CONST for the data attribute 2019-09-11 11:13:46 +01:00
Warren Buckley
9bbc66d10d Some rename of variables for readability 2019-09-11 11:06:38 +01:00
Warren Buckley
28a0e0aa6f Pass through a GUID that a media picker / new folder picker will use 2019-09-11 10:02:59 +01:00