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

146 Commits

Author SHA1 Message Date
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
Bjarke Berg
ef7af69731 https://github.com/umbraco/Umbraco-CMS/issues/7138 - Injected IIOHelper (#7581) 
Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
 2020-02-10 11:23:23 +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
Nathan Woulfe
902d4196cf add dialog for change password, shift form from user details view int… (#7450) 2020-01-27 06:29:04 +01:00
Benjamin Carleski
fd3ef48367 Use dependency injection for config classes 2020-01-21 17:25:03 -08:00
Benjamin Carleski
fceac19f04 Update controllers to include UmbracoMapper 2020-01-20 14:15:54 -08:00
Bjarke Berg
c6c0d7df54 AB4234 - Moved stuff from core into web, that used identity. 2020-01-07 13:50:38 +01:00
Bjarke Berg
58f9b48e16 Merge branch 'netcore/dev' into netcore/feature/AB3677-remove-current-from-core 
# Conflicts:
#	src/Umbraco.Abstractions/UriExtensions.cs
#	src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
#	src/Umbraco.Web/Editors/Filters/MemberSaveModelValidator.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/Editors/TemplateController.cs
#	src/Umbraco.Web/Models/Mapping/PropertyTypeGroupMapper.cs
#	src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs
#	src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
 2020-01-07 09:46:42 +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
dfeb97caa4 AB3677 - Moved usages of Current (Core) to Current (Web) 2019-12-19 15:53:50 +01:00
Bjarke Berg
0e4ac7f7d1 Merge remote-tracking branch 'origin/netcore/feature/AB4227-move-files-to-infrastructure' into netcore/feature/AB3677-remove-current-from-core 
# Conflicts:
#	src/Umbraco.Tests/TestHelpers/TestHelper.cs
 2019-12-19 12:27:51 +01:00
Bjarke Berg
2ed6b11b6f Merge remote-tracking branch 'origin/netcore/feature/AB3791-Move-scoping-to-infrastructure-and-replace-callcontext' into netcore/feature/AB4227-move-files-to-infrastructure 
# Conflicts:
#	src/Umbraco.Tests.Benchmarks/BulkInsertBenchmarks.cs
#	src/Umbraco.Tests/TestHelpers/TestHelper.cs
#	src/Umbraco.Web/Editors/UsersController.cs
 2019-12-19 11:34:08 +01:00
Bjarke Berg
67c54bec50 AB4227 - Review fixes - Added null logger + clean up 2019-12-19 11:23:31 +01:00
Bjarke Berg
d5527f0485 AB3677 - Removed lot of stuff from Current (Core) and uses Current (Web) instead 2019-12-19 10:43:34 +01:00
Bjarke Berg
7f9fbe9877 AB4227 - Removed StringExtensions from core.. 2019-12-18 18:55:00 +01:00
Bjarke Berg
6c923bc9b4 AB4227 - Moved a mix of files 2019-12-18 13:42:33 +01:00
Bjarke Berg
86574c5e11 Moved more files to abstractions 2019-12-06 12:09:47 +01:00
Shannon
d7fa5f0b66 Removes membership providers stuff from back office, removes all old legacy rules for passwords and membership providers. 2019-12-03 15:28:55 +11:00
Carole Rennie Logan
100d4431dc removing unused using statements 2019-11-19 23:24:08 +00:00
Bjarke Berg
47a0326e9c Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project 2019-11-15 11:43:05 +01:00
Shannon
221a0c8d9d Moves more stuff 2019-11-14 16:59:43 +11:00
Bjarke Berg
0be396c4fd Post merge fixes 2019-11-13 12:53:01 +01:00
Bjarke Berg
9889967b83 Merge branch 'netcore/feature/abstract-systemdirectories' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project 
# Conflicts:
#	src/Umbraco.Abstractions/Configuration/GlobalSettingsExtensions.cs
#	src/Umbraco.Core/ConfigsExtensions.cs
#	src/Umbraco.Core/Configuration/GlobalSettings.cs
#	src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
 2019-11-13 12:38:56 +01:00
Bjarke Berg
683c0da468 Moved stuff from SystemDirectories into constants and IOHelper to avoid a circular dependency 2019-11-13 11:56:32 +01:00
Bjarke Berg
ad91b2d9fc More movement 2019-11-13 10:48:51 +01:00
Bjarke Berg
0fcf8325e3 Changed SystemDirectories from static to instance, Added interface in abstractions and create a static property on current. 2019-11-12 15:25:21 +01:00
Bjarke Berg
13507c0e13 AB3653 - Static IOHelper -> IIOHelper (Moved into Current as a first step 😭) 2019-11-08 07:51:14 +01:00
Ronald Barendse
d0303f74fd Allow hash type on GenerateHash and remove obsoleted ToMd5 and ToSHA1 methods (#6679) 2019-10-23 17:19:49 +02:00
Carole Rennie Logan
77dc014b58 More inclusive language 2019-10-01 12:08:56 +02:00
Stephan
6c8ded6275 Better mapping of enumerable 2019-04-08 16:41:33 +02:00
Stephan
c5f934930e Merge branch 'v8/dev' into v8/feature/284-auto-mapper 2019-04-02 12:03:05 +02:00
Stephan
ef5646fa3b Cleanup, reduce AutoMapper exposure 2019-03-27 09:15:31 +01:00
Sebastiaan Janssen
559debc079 Merge branch 'dev-v7' into dev-v8 
# Conflicts:
#	src/Umbraco.Web/WebApi/Filters/UmbracoApplicationAuthorizeAttribute.cs
 2019-03-20 13:10:32 +01:00
Shannon
d74ec8f8cb Authorizes more endpoints for admin/non-admins 2019-03-15 12:39:46 +11:00
Shannon
e24b22f6bd Fixes the authorization for certain endpoints by non admins so that data cannot be seen and avatars cannot be changed 2019-03-15 12:20:24 +11:00
Bjarke Berg
1770a0abec Inject IUmbracoContextAccessor instead of UmbracoContext 2019-02-14 12:40:45 +01:00
Shannon
c2ff32aaab Fixing tests, don't expose UmbracoContext on UmbracoHelper, fixing all of the editor constructors 2019-02-01 15:24:07 +11:00
Chris Houston
0b6ba5aa52 Temp8 - Fixing spelling / typos etc in Umbraco.Web (#4148) 2019-01-26 16:52:19 +01:00
Stephan
9522ee826f Deal with fixme in Umbraco.Web 2019-01-21 16:01:37 +01:00
Stephan
1506d8c3fa Kill AppCaches.StaticCache 2019-01-18 15:49:54 +01:00
Stephan
3982732b7d Fix merge + cleanup 2019-01-18 15:05:20 +01:00
Stephan
0bee01e0ee Great AppCaches renaming 2019-01-17 11:01:23 +01:00
Shannon
44ab0991ce Package installing is working 2019-01-15 22:08:08 +11:00
Stephan
19ae9f5dee Refactor configuration for DI 2019-01-07 19:40:07 +01:00
Stephan
adced099be Move UmbracoConfig singleton to Current 2018-12-12 23:31:16 +01:00
Warren Buckley
54a2aa00a7 Revert "Temp8 tinymce" 2018-11-22 14:05:51 +00:00
Stephan
87a64b7406 Refactor filesystems (again) 2018-11-19 14:40:59 +01:00
Stephan
612c38654d Merge branch origin/dev-v7 into temp8 2018-09-06 13:07:09 +02:00
Sebastiaan Janssen
342ac7b1b2 Merge branch 'U4-11166' of https://github.com/jamescoxhead/Umbraco-CMS into jamescoxhead-U4-11166 2018-08-26 16:52:58 +02:00