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

845 Commits

Author SHA1 Message Date
Paul Johnson
822aa2897b Remove NotificationHandler lifetime hack 2020-12-21 15:36:31 +00:00
Shannon
03f22e9362 Fixing tests after merge 2020-12-21 16:44:50 +11:00
Shannon
86adf01f88 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/front-end-routing 
# Conflicts:
#	src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs
#	src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
#	src/Umbraco.Web.Common/Extensions/ApplicationBuilderExtensions.cs
 2020-12-21 16:04:42 +11:00
Paul Johnson
6114fffb4a Remove HostBuilder UseUmbraco extension, it's not required. 2020-12-18 09:53:01 +00:00
Paul Johnson
a883df9d88 Use HostBuilder.UseUmbraco in same order for tests and running web app 2020-12-17 12:44:09 +00:00
Paul Johnson
431403e372 Fixup CoreRuntime so it starts after Startup.Configure 
Makes integration tests play nice with Components as RuntimeLevel will be correct
 2020-12-17 11:19:47 +00:00
Paul Johnson
91e2f58822 Drop ManifestWatcherComposer, Convert CoreInitialComposer to extension on UmbracoBuilder 2020-12-17 11:19:47 +00:00
Paul Johnson
ef310920cb Remove ManifestWatcherComponent 2020-12-17 11:17:46 +00:00
Paul Johnson
a69739a7a2 Remove CoreInitialComponent 2020-12-17 11:17:46 +00:00
Bjarke Berg
0151c435f1 Netcore: Package support for media + media types (#9547) 
* Add support for media when installing a package

* clean up

* Fix tests

* Add support for media when installing a package

* clean up

* Fix tests

* moved tests + test data

* Migrated package tests + resources

* Fix issue with media picker on package page, was empty after save.

* Added missing files

* Fix casing issue of resources

* Added test for media

* Fix tests for linux

* Fix test

* Fix issue with move media..

* Fix issue with adding files to packages

* Add MediaType permissions.

* Fix test

* Fix test

* Retry flaky tests, and added TODOs to fix those

* new attempt to fix test

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
 2020-12-16 22:26:47 +01:00
Shannon
ce508d08ec Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/front-end-routing 
# Conflicts:
#	src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Web.BackOffice/Extensions/BackOfficeApplicationBuilderExtensions.cs
 2020-12-16 16:18:10 +11:00
Bjarke Berg
1e09d0b063 Merge remote-tracking branch 'origin/v8/dev' into netcore/netcore 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Runtime/MainDom.cs
#	src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Preview.cshtml
#	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
 2020-12-14 22:16:21 +01:00
Paul Johnson
312ab96277 Resolve issues with AdvancedMigrationTests 2020-12-11 19:04:39 +00:00
Paul Johnson
51f20119a2 Enable running integrations tests on Linux 2020-12-11 14:12:34 +00:00
Shannon
776df77dfe Notes and cleanup 2020-12-11 15:29:27 +11:00
Shannon
b5e3bc9e0d Fix the UmbracoViewPage and view model binding, combine the tests cases, remove IPublishedContentType2, front end is rendering 2020-12-11 14:55:19 +11:00
Shannon
63ab8ec52c Lots of notes, removes data tokens, 2020-12-10 18:09:32 +11:00
Emma Garland
2c006ea99f PR comments updated. Reorganised logic. Removed unused functionality. Started to reorganise update and save roles functionality. 2020-12-09 18:36:39 +00:00
Shannon
4b85f8eb20 Big refactor or PublishedSnapshotService to split up so that there's a service and repository responsible for the data querying and persistence 2020-12-09 22:43:49 +11:00
Emma Garland
ec09c9b09f removed unwanted members folder 2020-12-09 09:52:58 +00:00
Nikolaj
7ef6501bb1 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/more-files-from-infrastructure-to-core 
# Conflicts:
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ConvertersTests.cs
 2020-12-09 08:45:28 +01:00
Emma Garland
205edf57b7 Added store functionality based on backoffice user (to be revisited as a lot of it may be shareable) and also added a new members service method for membergroups. 2020-12-08 17:18:22 +00:00
Emma Garland
9531550e86 Merge branch 'netcore/netcore' into netcore/members-userstore 2020-12-08 11:04:17 +00:00
emmagarland
3f0e7ab315 Merged and updated according to shared latest work, renamed to Members instead of UmbracoMembers. Tests currently red, fixing next. Empty appsettings again. 2020-12-08 01:57:14 +00:00
Shannon
30bfa3f003 more cleanup of system dirs 2020-12-08 11:08:14 +11:00
Shannon
ea55d2662e no app_data paths, changing to constants, some linting updates 2020-12-08 10:42:26 +11:00
emmagarland
bcccbd3c73 Removed roles as not currently used for member 2020-12-07 17:40:21 +00:00
emmagarland
b59935c799 Merge branch 'netcore/netcore' into netcore/members-userstore 2020-12-07 17:26:15 +00:00
Bjarke Berg
e79ed7a56b Post merge - Build fix 2020-12-07 16:11:14 +01:00
Bjarke Berg
e7d9d38c52 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/more-files-from-infrastructure-to-core 
# Conflicts:
#	src/Umbraco.Infrastructure/Install/InstallSteps/NewInstallStep.cs
#	src/Umbraco.Tests.Common/Builders/DataEditorBuilder.cs
#	src/Umbraco.Tests.Common/Builders/DataValueEditorBuilder.cs
 2020-12-07 12:55:47 +01:00
Bjarke Berg
5dbddfffc5 Merge remote-tracking branch 'origin/v8/dev' into netcore/netcore 
# Conflicts:
#	.gitignore
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Models/PropertyType.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
#	src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs
#	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
#	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
 2020-12-07 12:31:26 +01:00
Bjarke Berg
dfb2b5515d Merge pull request #9505 from AndyButland/feature/clean-up-2 
NetCore: updated some more code to match linting rules.
 2020-12-07 07:56:59 +01:00
Bjarke Berg
8261d9c320 Merge pull request #9503 from AndyButland/feature/clean-up 
NetCore: updated some code to match linting rules
 2020-12-07 07:54:22 +01:00
Andy Butland
9f8138b2d0 Adhered to linting rules configuration models, validators and tests. 2020-12-06 10:51:31 +01:00
emmagarland
40f2a881ab Added is dirty properties and updated to reflect linter update 2020-12-05 23:44:50 +00:00
emmagarland
0560bef48c Merge branch 'netcore/netcore' into netcore/members-userstore 2020-12-05 18:14:09 +00:00
Andy Butland
201940290c Adhered to linting rules in hosted services implementations and tests. 2020-12-05 10:06:59 +01:00
Bjarke Berg
fb18317c0f Moved lots of property editors into core 2020-12-04 19:01:52 +01:00
Bjarke Berg
eb03145fa6 Moved media files and introduced IImageDimensionExtractor and to avoid System.drawing in core 2020-12-04 15:04:29 +01:00
Bjarke Berg
21e3cf0887 Moved files and introduced IMarkdownToHtmlConverter to avoid packages to handle markdown in core 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-12-04 13:03:40 +01:00
Shannon
9441f5c5ea fix remaining test 2020-12-04 15:05:47 +11:00
Shannon
d206273753 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/usermanager-object-cleanup 
# Conflicts:
#	src/Umbraco.Infrastructure/Composing/CompositionExtensions/CoreMappingProfiles.cs
#	src/Umbraco.Web.BackOffice/Extensions/WebMappingProfiles.cs
 2020-12-04 12:59:19 +11:00
Shannon
406528f553 flows claims 2020-12-04 12:54:31 +11:00
Shannon
216b8559da cleanup 2020-12-04 12:52:25 +11:00
Shannon
5172b0e58a Updates user manager, user store and identity user to use the aspnetcore base classes instead of copies of our own, uses string ids for user and roles to simplify everything and to allow for sharing between members 2020-12-04 12:44:27 +11:00
Emma Garland
57684a8672 Removed unwanted comments 2020-12-03 17:54:02 +00:00
Emma Garland
785570761a Removed identity work for now 2020-12-03 15:59:54 +00:00
Shannon
86d231f5de removes remaining back office things from underlying UmbracoUserManager moves files 2020-12-04 02:21:21 +11:00
Emma Garland
cf2252f967 Reordered for better comparison 2020-12-03 14:59:57 +00:00
Shannon
35af86c3d3 Splits user manager into a base class that can be reused changes base class of IdentityUser to UmbracoIdentityUser 2020-12-04 01:38:36 +11:00