Commit Graph

1759 Commits

Author SHA1 Message Date
Scott Brady
d08bb08f57 Cleanup 2020-04-28 13:05:40 +01:00
Scott Brady
3584aa9fa3 Fixed naming for login info wrapper 2020-04-28 13:00:02 +01:00
Scott Brady
52d6c86d8b Merge branch 'netcore/dev' into netcore/feature/users 2020-04-16 09:41:27 +01:00
Scott Brady
e5f3c4a186 Security stamp validator. Removed more references to ASP.NET Identity 2 2020-04-06 17:23:04 +01:00
Scott Brady
db87a9dd40 Compiling with minimal Microsoft.AspNet.Identity references 2020-03-16 13:53:03 +00:00
Bjarke Berg
c486444eda Cleaned up config for Content settings 2020-03-12 15:30:22 +01:00
Scott Brady
4e69e1abe6 Initial user store 2020-03-09 16:01:57 +00:00
Andy Butland
8e3967c596 Merge branch 'netcore/dev' into netcore/77007-replace-no-nodes
# Conflicts:
#	src/Umbraco.Core/Configuration/IGlobalSettings.cs
#	src/Umbraco.Core/Constants-Web.cs
2020-03-06 07:28:13 +01:00
Bjarke Berg
e9f7034365 Moved compoenents and composers 2020-03-03 07:29:51 +01:00
Andy Butland
e6a55a215a Replaced nonodes.aspx with MVC controller and view, with configurable view location. 2020-02-29 14:26:35 +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
Bjarke Berg
bf4023afa7 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
#	src/Umbraco.Infrastructure/PropertyEditors/DataValueReferenceFactoryCollection.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs
2020-02-25 11:57:11 +01:00
Warren Buckley
4ed69d21a0 Merge branch 'v8/8.6' up into v8/dev
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
2020-02-24 15:11:58 +00: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
Shannon
5cb5585574 Removes ICurrentUserAccessor since we don't need it, fixes editorconfig (for now) 2020-02-19 15:38:22 +11:00
Shannon
653616912a Fixes issue when a user's start node is below a list view and when there's list views below that 2020-02-19 13:43:48 +11:00
Bjarke Berg
43b33f9e6b Move features
- Introduced IUmbracoFeature
Move Install
Move Tree Items
 - Introduced IMenuItemCollectionFactory - to insure injection of ActionCollection
2020-02-17 14:58:34 +01:00
Bjarke Berg
7a6ded2f6e Merge branch 'netcore/feature/move-files-after-umbraco-context-abstractions' into netcore/feature/move-mappings-after-httpcontext 2020-02-17 13:23:02 +01:00
Bjarke Berg
aeca49dddb Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/move-files-after-umbraco-context-abstractions
# Conflicts:
#	src/Umbraco.Abstractions/PublishedContentExtensions.cs
#	src/Umbraco.Abstractions/Routing/AliasUrlProvider.cs
#	src/Umbraco.Abstractions/Routing/DefaultMediaUrlProvider.cs
#	src/Umbraco.Abstractions/Routing/DefaultUrlProvider.cs
#	src/Umbraco.Abstractions/Routing/UrlProvider.cs
#	src/Umbraco.Abstractions/Routing/UrlProviderExtensions.cs
#	src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
#	src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs
#	src/Umbraco.Tests/Routing/GetContentUrlsTests.cs
#	src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
#	src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
#	src/Umbraco.Tests/Routing/UrlProviderTests.cs
#	src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
#	src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
#	src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs
#	src/Umbraco.Tests/TestHelpers/TestHelper.cs
#	src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
#	src/Umbraco.Tests/Testing/Objects/TestUmbracoContextFactory.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs
#	src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/UmbracoContext.cs
#	src/Umbraco.Web/UmbracoContextFactory.cs
#	src/Umbraco.Web/UmbracoInjectedModule.cs
2020-02-17 13:07:59 +01:00
Bjarke Berg
2b8be2cf00 Netcore: Move files from Web/Routing to Abstractions/Routing (#7642)
* AB4951 - Move routing files to abstractions

* Changed UriUtility from static to instance

* Moved more files from Routing in web to Abstractions

* Moved UrlProvider to Abstractions

* Moved PublishedRequest to Abstractions
2020-02-17 12:07:51 +01:00
Bjarke Berg
402867f115 Moved lots of mapping files 2020-02-17 09:15:48 +01:00
Bjarke Berg
c6e1e7b3e5 Untangled UrlProvider from UmbracoContext 2020-02-14 13:06:10 +01:00
Bjarke Berg
31130be85a Move files 2020-02-13 12:58:05 +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
Bjarke Berg
b57a7690f5 Moved More files to infrastructure/abstractions 2020-02-13 11:21:20 +01:00
Bjarke Berg
a69b985002 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB4919-untable-umbraco-context 2020-02-13 09:50:19 +01:00
Bjarke Berg
85afde0ea1 Replaced usages of HttpContext.Items with usages of IRequestCache 2020-02-13 07:46:49 +01:00
Shannon
7182be93d9 Ensures that we don't set IsChildOfListView when it's a user's start node since we are actually rendering that tree node when that is the case 2020-02-12 13:47:48 +11: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
Bjarke Berg
d151503dbf Started replacing UmbracoContext.HttpContext with injection of IHttpContextAccessor 2020-02-10 14:22:18 +01:00
Benjamin Carleski
4309489174 Make changes for PR suggestions 2020-02-09 11:12:29 -08:00
Bjarke Berg
c335a8dbb5 Introduced interface on UmbracoContext 2020-02-09 19:05:39 +01:00
Benjamin Carleski
408ee452e1 Code cleanup, added unit tests 2020-02-08 11:05:14 -08:00
Benjamin Carleski
a7ff20de6e Introduce Image URL Generator abstraction 2020-02-07 15:01:03 -08: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
Bjarke Berg
420d8d2ba8 Merge remote-tracking branch 'origin/netcore/dev' into feature/netcore-publish-cache 2020-02-04 07:14:41 +01:00
Robert Foster
a3bf9d2a51 Renamed "DermineIsChildOfListView" to "DetermineIsChildOfListView" 2020-02-02 13:00:40 +01:00
Andy Butland
171fce2ecb Moved PublishedCache from Umbraco.Web into .Net standard project.
Returned to compiling state with a number of things to check and some temporarily commented out functionality.
2020-01-30 20:08:03 +01:00
Shannon
5b5aa4c499 All Lucene based logic is part of Umbraco.Examine.Lucene, no other part of Umbraco now knows about Lucene at all. 2020-01-29 12:24:57 +11:00
Shannon
0695d308c2 Moves remaining non-lucene stuff 2020-01-28 17:07:06 +11:00
Shannon
0343b302f3 Moving stuff to Examine2 (temp name) as a netstandard project, updates to latest Examine netstandard, moves constants to separate class. 2020-01-28 16:37:55 +11:00
Bjarke Berg
3b7825b30d Netcore: Moves services and dependencies from Web to Abstractions (#7497)
* Moves the services and dependencies from web,

* Fix bug with Empty collection not being a property (new one for each access)

* remvoed moved files from web csproj

* Fix spelling
2020-01-27 09:31:24 +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
Bjarke Berg
a9e6919420 Merge pull request #7496 from benjaminc/netcore/feature/7369-remove-current-services
Replace Current.Services references with DI where possible
2020-01-23 13:39:59 +01:00
Bjarke Berg
1bfb64bdd8 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
#	src/Umbraco.Abstractions/Constants-AppSettings.cs
#	src/Umbraco.Abstractions/ContentVariationExtensions.cs
#	src/Umbraco.Abstractions/IMainDom.cs
#	src/Umbraco.Abstractions/PropertyEditors/MultiUrlPickerConfiguration.cs
#	src/Umbraco.Abstractions/Runtime/IMainDom.cs
#	src/Umbraco.Abstractions/Runtime/MainDom.cs
#	src/Umbraco.Core/IMainDom.cs
#	src/Umbraco.Core/MainDom.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Infrastructure/MainDom.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
#	src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
#	src/Umbraco.Web/UmbracoApplication.cs
#	src/Umbraco.Web/UmbracoComponentRenderer.cs
2020-01-23 13:16:49 +01:00
Benjamin Carleski
a379e01578 Replace Current.Services references with DI where possible 2020-01-22 21:43:25 -08:00
Ronald Barendse
b01f2ed35e Merge remote-tracking branch 'upstream' into v8/bugfix/enum-extensions 2020-01-22 11:04:11 +01:00
Warren Buckley
81a0a52874 Merge branch 'v8/feature/media-tracking' into v8/dev
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
2020-01-22 08:36:32 +00:00
Benjamin Carleski
fd3ef48367 Use dependency injection for config classes 2020-01-21 17:25:03 -08:00