Commit Graph

140 Commits

Author SHA1 Message Date
Bjarke Berg
a4e5029912 Refactored to remove Configs 2020-09-10 13:51:59 +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
Bjarke Berg
a02b5e93a5 Merge pull request #8598 from umbraco/netcore/feature/6972-migrate-non-oauth-auth-controller
Migrates remaining non-oauth AuthenticationController actions to netcore
2020-08-11 07:30:23 +02:00
Bjarke Berg
6d51dc4afa Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/6976-migrate-preview-middleware 2020-08-10 14:30:25 +02:00
Bjarke Berg
c57c42d2ec Fixes merge conflicts 2020-08-07 14:00:56 +02:00
Shannon
cca7303abd Migrates preview auth Middleware
Migrates UriExtensionsTests to netcore, fixes preview controller bits, adds tests for preview path for back office route check, fixes virtual paths for views,
2020-08-07 00:48:32 +10:00
Shannon
b9a4a75656 Migrates remaining non-oauth AuthenticationController actions to netcore 2020-08-06 19:09:05 +10:00
Bjarke Berg
3ea7945f24 Get rid of system web in netcore and netstandard libraries 2020-08-05 08:44:22 +02:00
Elitsa Marinovska
3a780db3fc Updating old comments 2020-08-04 20:29:48 +02:00
Shannon
d9c2e5f55c Migrates remaining non-oauth actions on back office controller to netcore 2020-08-04 14:30:42 +10:00
Shannon
4edf7fdf83 Ensure all back office controllers are plugin controllers and use constant 2020-08-04 12:27:21 +10:00
Bjarke Berg
66a549c89b Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB4822-nuget-packages-basis 2020-07-09 18:03:15 +02:00
Bjarke Berg
1dcacda036 Moved umbraco cshtml files into the umbraco folder
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-07-08 11:18:23 +02:00
Bjarke Berg
f3614d51fa Merge remote-tracking branch 'origin/netcore/feature/contentcontroller_and_related' into netcore/feature/remaining-backoffice-controllers
# Conflicts:
#	src/Umbraco.Web.BackOffice/Filters/UmbracoAuthorizeFilter.cs
2020-07-07 13:17:08 +02:00
Bjarke Berg
610bbee245 Added OverrideAuthorizationAttribute
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-07-07 12:39:24 +02:00
Bjarke Berg
a9c043c537 Cleanup based on review
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-07-06 12:58:11 +02:00
Bjarke Berg
8400b53f70 Cleanup based on review
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-07-06 12:55:23 +02:00
Bjarke Berg
adb38dceb5 Merge remote-tracking branch 'origin/netcore/feature/contentcontroller_and_related' into netcore/feature/remaining-backoffice-controllers 2020-06-28 14:00:26 +02:00
Bjarke Berg
3d65cb96e1 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/contentcontroller_and_related
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
2020-06-28 13:59:33 +02:00
Bjarke Berg
9d639a64b3 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Core/Templates/IUmbracoComponentRenderer.cs
#	src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
2020-06-28 13:35:25 +02:00
Bjarke Berg
1594a84d80 migated remaining backoffice controllers
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-06-22 10:08:08 +02:00
Bjarke Berg
558c0b03ee Migrated MemberController
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-06-18 21:03:11 +02:00
Bjarke Berg
748d23bf6d Added MemberTypeController
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-06-18 19:50:42 +02:00
Bjarke Berg
73123704cd Added JsonDateTimeFormatAttribute
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-06-18 19:40:13 +02:00
Bjarke Berg
27227043ba Added custom (hack) for PrefixlessBodyModelValidatorAttribute. 2020-06-18 14:40:30 +02:00
Bjarke Berg
593acaeab9 Merge remote-tracking branch 'origin/netcore/feature/migrate-remaining-trees' into netcore/feature/migrate-remaining-trees 2020-06-17 18:06:03 +02:00
Bjarke Berg
fe7d4ed3e9 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-remaining-trees 2020-06-17 18:05:40 +02:00
Bjarke Berg
d5f2d8456a Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/contentcontroller_and_related
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeNotificationsController.cs
#	src/Umbraco.Web.BackOffice/Filters/ValidateAngularAntiForgeryTokenAttribute.cs
2020-06-17 17:01:45 +02:00
Bjarke Berg
3a33e7bf29 Migrated ControllerContentTests.. Right now the test fails, but the test is correct
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-06-17 16:39:28 +02:00