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

167 Commits

Author SHA1 Message Date
Mole
1fdebb6bd9 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Runtime/BackOfficeComposer.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
 2020-09-22 13:49:25 +02:00
Mole
c0616d516a Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging 
# Conflicts:
#	src/Umbraco.Infrastructure/Scheduling/ScheduledPublishing.cs
#	src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
#	src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MacrosController.cs
#	src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs
#	src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
#	src/Umbraco.Web.BackOffice/Filters/ContentModelValidator.cs
#	src/Umbraco.Web.BackOffice/Filters/ContentSaveModelValidator.cs
#	src/Umbraco.Web.BackOffice/Filters/ContentSaveValidationAttribute.cs
#	src/Umbraco.Web.BackOffice/Filters/MediaItemSaveValidationAttribute.cs
#	src/Umbraco.Web.BackOffice/Filters/MediaSaveModelValidator.cs
#	src/Umbraco.Web.BackOffice/Filters/MemberSaveModelValidator.cs
#	src/Umbraco.Web.BackOffice/Filters/MemberSaveValidationAttribute.cs
#	src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs
#	src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs
#	src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs
#	src/Umbraco.Web.Common/Install/InstallController.cs
 2020-09-22 13:44:22 +02:00
Bjarke Berg
c2f343b17d Merge remote-tracking branch 'origin/netcore/netcore' into netcore/netcore 2020-09-22 13:28:50 +02:00
Bjarke Berg
a28168667b Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Core/Editors/BackOfficePreviewModel.cs
#	src/Umbraco.Core/Models/IconModel.cs
#	src/Umbraco.Web.BackOffice/Controllers/IconController.cs
#	src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeModel.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
 2020-09-22 13:28:03 +02:00
Bjarke Berg
a80de91031 Netcore: Handle tree authentication (#8866) 
* Added helper methods to invoke the authorization filters of the other controller action

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Implemented Tree Auth

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* cleanup

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Throw forbidden if user has no access instead of InternalServerError

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* EnsureBackofficeSecurity for background jobs

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2020-09-22 13:19:54 +02:00
Bjarke Berg
96facc4d35 Netcore: Introduce BackofficeSecurityAccessor (#8871) 
* Introduced IWebSecurityAccessor

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Fixed tests

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Renamed WebSecurity to BackofficeSecurity and all related names

* Fixes typos

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2020-09-22 10:01:00 +02:00
Mole
ab3ac5ad91 Remove a bunch of references to the old logger 2020-09-21 11:19:46 +02:00
Mole
894abdd183 Remove a bunch of references to the old logger 2020-09-21 09:41:18 +02:00
Mole
578e8c4f9e Use MS ILogger for DataEditor 2020-09-18 14:37:19 +02:00
Mole
d61b9f54fa Merge options 2020-09-18 12:53:06 +02:00
Nikolaj
4b254a02a8 Use MS Ilogger for FileSystem 2020-09-17 11:35:29 +02:00
Nikolaj
52051629ba Use generic logger in controllers 2020-09-16 10:55:41 +02:00
Nikolaj
a18580c7f6 Remove Debug<T> from LoggerExtensions 2020-09-16 10:24:05 +02:00
Nikolaj
488093add3 Remove LogWarning<T> from LoggerExtensions 2020-09-16 10:08:18 +02:00
Nikolaj
dda6fb12a3 Remove LogError<T> from LoggerExtensions 2020-09-16 09:40:49 +02:00
Bjarke Berg
9d91e629c6 Bugfix in CheckIfUserTicketDataIsStaleAttribute 2020-09-15 10:13:05 +02:00
Nikolaj
02828db8fd Add work on PublishedSnapshotService 2020-09-15 08:45:40 +02:00
Bjarke Berg
ce2da18304 Fixed based on review comments 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-14 21:27:31 +02:00
Bjarke Berg
8141e7c6c8 Bugfix 2020-09-14 14:35:57 +02:00
Nikolaj
5e17aa3bf1 Finish aligning ILogger to MS ILogger 2020-09-14 14:25:59 +02:00
Bjarke Berg
e74570c0ac More clean up of old configs 2020-09-14 14:12:38 +02:00
Nikolaj
161061dbbc Remove exception logging and finish LogWarning 2020-09-14 14:10:19 +02:00
Nikolaj
a1ecc4a5c9 Change Warn to LogWarning 2020-09-14 10:17:32 +02:00
Nikolaj
d7e3bce741 Rename Error to align it with MS ILogger 2020-09-14 09:10:53 +02:00
Bjarke Berg
dc643ab6a6 Merge remote-tracking branch 'origin/netcore/netcore' into feature/8651-config-options-patten 
# Conflicts:
#	src/Umbraco.Core/Configuration/ModelsBuilderConfigExtensions.cs
#	src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs
#	src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs
#	src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs
#	src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
#	src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs
#	src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs
#	src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
#	src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs
 2020-09-10 14:01:38 +02:00
Bjarke Berg
a4e5029912 Refactored to remove Configs 2020-09-10 13:51:59 +02:00
Bjarke Berg
fc054e6546 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Web.nuspec
#	src/SolutionInfo.cs
#	src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs
#	src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
#	src/Umbraco.Tests.AcceptanceTest/package.json
#	src/Umbraco.Tests/TestHelpers/TestObjects.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ImageUrlGeneratorController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MemberTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/RelationTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/TemplateController.cs
#	src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
#	src/Umbraco.Web.UI.Client/src/installer/steps/database.html
#	src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
#	src/Umbraco.Web.UI.Client/src/less/components/umb-property-actions.less
#	src/Umbraco.Web.UI.Client/src/less/forms.less
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
#	src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-actions.html
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
#	src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html
#	src/Umbraco.Web.UI.Client/src/views/dictionary/list.html
#	src/Umbraco.Web.UI.Client/src/views/logViewer/search.html
#	src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/mediaTypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/memberTypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.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
#	src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
#	src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
#	src/Umbraco.Web/Editors/DictionaryController.cs
#	src/Umbraco.Web/Editors/LogController.cs
#	src/Umbraco.Web/Editors/MediaTypeController.cs
#	src/Umbraco.Web/Editors/MemberGroupController.cs
 2020-09-09 19:13:37 +02:00
Elitsa Marinovska
78dd6c40da Fixes issue https://github.com/umbraco/Umbraco-CMS/issues/8835 on alpha001 regarding disabling/enabling url tracking 2020-09-08 15:50:52 +02:00
Bjarke Berg
c8669b18c2 Merge remote-tracking branch 'origin/netcore/netcore' into feature/8651-config-options-patten 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-04 14:30:48 +02:00
Bjarke Berg
1218f3564c Merge pull request #8798 from umbraco/netcore/bugfix/integration-tests-examine-indexes 
Fixes integration tests bootstrapping
 2020-09-04 10:54:43 +02:00
Bjarke Berg
d69c93e4ee https://github.com/umbraco/Umbraco-CMS/issues/8814 - Decoreated endpoints with DetermineAmbiguousActionByPassingParametersAttribute 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-04 09:32:35 +02:00
Shannon
855a58a3cc fix tests 2020-09-04 01:40:46 +10:00
Andy Butland
f1bda37a64 Updates following PR review. 2020-09-01 18:10:12 +02:00
Andy Butland
2a59a8385c Merge branch 'netcore/netcore' into feature/8651-config-options-patten 
# Conflicts:
#	src/Umbraco.Tests.Common/Builders/GlobalSettingsBuilder.cs
#	src/Umbraco.Tests/TEMP/DatabaseContextTests.sdf
#	src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs
 2020-08-27 09:03:01 +02:00
Bjarke Berg
459e730510 Fix issues after merge 2020-08-26 08:17:05 +02:00
Bjarke Berg
3d55dcd3c4 Merge remote-tracking branch 'netcore/dev' into netcore/netcore 2020-08-26 08:05:15 +02:00
Andy Butland
8fd59d546e Fixed failing tests. 2020-08-26 07:55:23 +02:00
Andy Butland
967f0be705 Aligned property names in code with those in configuration. 2020-08-25 10:45:54 +02:00
Andy Butland
c3c8d79720 Merge branch 'netcore/netcore' into feature/8651-config-options-patten 2020-08-24 09:45:25 +02:00
Shannon Deminick
826e5ec49b Merge pull request #8672 from umbraco/netcore/feature/migrate_api_GetCurrentUserLinkedLogins 
NetCore: Migrate GetCurrentUserLinkedLogins api
 2020-08-24 14:26:14 +10:00
Andy Butland
2cd91a5a54 Converted to IOptions over IOptionsSnapshot due to the latter only working in scoped services. 
Further amends to return to booting application.
 2020-08-23 23:36:48 +02:00
Andy Butland
510bd92e78 Amended injection of further settings to use IOptionsSnapshot. 2020-08-21 14:52:47 +01:00
Andy Butland
e3a44c6717 Moved configuration setting POCOs into Umbraco.Core and adjusted references. 
Amended injection of some settings to use IOptionsSnapshot.
 2020-08-20 22:18:50 +01:00
Bjarke Berg
0a88cfe510 Fix issue with query params not binding for PostNotificationOptions 2020-08-20 14:10:35 +02:00
Bjarke Berg
a2b82970ac Migrate GetCurrentUserLinkedLogins api 2020-08-20 11:54:35 +02:00
Andy Butland
a3e84ea3a8 (WIP) migrated TourSettings to use IOptions pattern for configuration. 2020-08-19 14:14:01 +01:00
Andy Butland
a2a850e1b2 Applied fix to query parameter binding for saving public access configuration on a content item. 2020-08-18 11:47:53 +01:00
Andy Butland
1f206766ab Fixed log viewer level filter by correcting binding for provided array of selected values to filter by. 2020-08-18 11:07:59 +01:00
Bjarke Berg
7b95494e30 Merge pull request #8572 from umbraco/netcore/bugfix/6970-backoffice-controller 
Migrates remaining non-oauth actions on back office controller to netcore
 2020-08-17 08:29:59 +02:00
Bjarke Berg
94e1056dd9 Merge pull request #8603 from umbraco/netcore/feature/6976-migrate-preview-middleware 
Migrates preview auth Middleware
 2020-08-11 08:24:57 +02:00