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

32832 Commits

Author SHA1 Message Date
Shannon
166b86a007 Revert "updates test libs - lets see if the build works now" 
This reverts commit 41ae2f3b7d.
 2021-01-20 18:12:45 +11:00
Shannon
3d24376136 missing file 2021-01-20 15:38:21 +11:00
Shannon
5b86182fae fixing tests 2021-01-20 15:12:31 +11:00
Shannon
6bed0e6c29 missing imports 2021-01-20 14:58:19 +11:00
Shannon
41ae2f3b7d updates test libs - lets see if the build works now 2021-01-20 14:55:34 +11:00
Shannon
acdaba5d47 more cleanup 2021-01-19 19:16:42 +11:00
Shannon
b53bdf859a removes unneeded files, adds notes 2021-01-19 19:12:43 +11:00
Shannon
4be5ae6d99 splits files 2021-01-19 18:54:02 +11:00
Shannon
58b2b613e5 Removes the need for MetadataReference since we no longer require that 2021-01-19 18:44:19 +11:00
Shannon
1614e9a53c Removes MB.Enabled since it doesn't make since, Removes MB.EnableFactory since that cannot ever be not enabled, fixes up settings usage, primarily we just check for models mode 2021-01-19 18:29:14 +11:00
Shannon
0ce34bea18 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/models-builder-9789 
# Conflicts:
#	src/Umbraco.ModelsBuilder.Embedded/ModelsBuilderNotificationHandler.cs
 2021-01-19 17:43:18 +11:00
Shannon
927b84a9f0 Cleans up POC code 2021-01-19 16:51:55 +11:00
Shannon
f320d41b1d Commits progress so far, then will cleanup a bunch 2021-01-19 15:46:25 +11:00
Bjarke Berg
a54e10bc13 Merge remote-tracking branch 'origin/v8/dev' into netcore/feature/merge-v8-18-01-2021 
# Conflicts:
#	.gitignore
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/BackOfficeElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IBackOfficeSection.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
#	src/Umbraco.Core/IO/SystemFiles.cs
#	src/Umbraco.Core/Models/ContentBase.cs
#	src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
#	src/Umbraco.Core/Persistence/UmbracoDatabaseExtensions.cs
#	src/Umbraco.Core/Runtime/CoreRuntime.cs
#	src/Umbraco.Core/RuntimeOptions.cs
#	src/Umbraco.Core/RuntimeState.cs
#	src/Umbraco.Core/Telemetry/TelemetryMarkerComponent.cs
#	src/Umbraco.Core/Telemetry/TelemetryMarkerComposer.cs
#	src/Umbraco.Examine/Umbraco.Examine.csproj
#	src/Umbraco.Infrastructure/HostedServices/ReportSiteTask.cs
#	src/Umbraco.Infrastructure/Install/InstallStepCollection.cs
#	src/Umbraco.Infrastructure/Install/InstallSteps/NewInstallStep.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
#	src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ContentTypeRepositoryTest.cs
#	src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
#	src/Umbraco.Tests/Runtimes/StandaloneTests.cs
#	src/Umbraco.Tests/Testing/TestDatabase.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
#	src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js
#	src/Umbraco.Web.UI.NetCore/Views/Partials/Grid/Editors/TextString.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/config/umbracoSettings.Release.config
#	src/Umbraco.Web/Composing/CompositionExtensions/Installer.cs
#	src/Umbraco.Web/Editors/PreviewController.cs
#	src/Umbraco.Web/Editors/UsersController.cs
#	src/Umbraco.Web/JavaScript/PreviewInitialize.js
#	src/Umbraco.Web/Telemetry/TelemetryComponent.cs
#	src/Umbraco.Web/UmbracoApplication.cs
 2021-01-18 16:06:23 +01:00
Bjarke Berg
05ef2d80ae Merge branch 'feature/clean-up-umbraco-tests-common' into netcore/feature/merge-v8-18-01-2021 2021-01-18 10:47:18 +01:00
Bjarke Berg
7f27aa1dfe Fix merge issue 2021-01-18 08:45:14 +01:00
Bjarke Berg
6310ca31e3 Merge remote-tracking branch 'origin/netcore/netcore' into feature/clean-up-umbraco-integration-tests 
# Conflicts:
#	src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs
#	src/Umbraco.Tests.Integration/RuntimeTests.cs
#	src/Umbraco.Tests.Integration/TestServerTest/UmbracoBuilderExtensions.cs
#	src/Umbraco.Tests.Integration/Umbraco.Core/IO/FileSystemsTests.cs
#	src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UmbracoMapperTests.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopedRepositoryTests.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs
 2021-01-18 07:34:59 +01:00
Bjarke Berg
16ef520e8c Merge remote-tracking branch 'origin/netcore/netcore' into feature/clean-up-umbraco-tests-common 
# Conflicts:
#	src/Umbraco.Tests.Common/Testing/UmbracoTestAttribute.cs
 2021-01-18 06:44:01 +01:00
Shannon
5f9447fc2a Got a POC working with dynamic recompilation 2021-01-15 18:17:13 +11:00
Bjarke Berg
9d0665e66c Merge pull request #9601 from umbraco/netcore/feature/remove-httpresponseexception 
NetCore: Getting rid of HttpResponseException
 2021-01-15 07:26:19 +01:00
Bjarke Berg
04bb4e99b6 Fixed possible null reference exceptions 2021-01-14 19:41:32 +01:00
Shannon
7f1e711481 committing changes, notes, etc... so far 2021-01-14 23:14:35 +11:00
Sebastiaan Janssen
e696aea1fc Merge branch 'v8/8.11' into v8/dev 2021-01-13 16:50:54 +01:00
Sebastiaan Janssen
1842f766ae Merge branch 'v8/8.10' into v8/8.11 2021-01-13 16:50:02 +01:00
Sebastiaan Janssen
7cbc09ba89 Merge branch 'v8/8.9' into v8/8.10 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
 2021-01-13 16:49:33 +01:00
Sebastiaan Janssen
29979a55a0 Merge branch 'v8/8.8' into v8/8.9 2021-01-13 16:40:10 +01:00
Sebastiaan Janssen
2fd85c58b5 Merge branch 'v8/8.7' into v8/8.8 2021-01-13 16:38:47 +01:00
Callum Whyte
4dd554172b Nested content UI fixes (#9384) 
* Fixing spacing of nested content header + icon

* Removing border from single Nested Content properties

* fix overlapping icon on nested content with multiple items

Co-authored-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
Co-authored-by: Mads Rasmussen <madsr@hey.com>
(cherry picked from commit 0fdd599596)

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
 2021-01-13 16:37:09 +01:00
Elitsa Marinovska
680f8c4d96 Other special cases 2021-01-13 16:25:21 +01:00
Elitsa Marinovska
ded3a06170 Special case where the user is not authorized 2021-01-13 16:17:39 +01:00
Elitsa Marinovska
7c5e045868 Commenting out 2 GetModelFromMultipartRequest() and ReadAsMultipart() as for the moment they are not used and we need to rethink how to handle them 2021-01-13 16:16:11 +01:00
Elitsa Marinovska
3a51965358 Placing the code for checking if a ModelState is invalid directly 2021-01-13 16:14:20 +01:00
Elitsa Marinovska
ccfb915584 Getting rid of HttpResponseExceptionFilter 2021-01-13 16:08:00 +01:00
Bjarke Berg
99188da03a Merge pull request #9647 from umbraco/netcore/task/adding-tests-for-routing 
Adding tests for routing
 2021-01-13 13:34:32 +01:00
Bjarke Berg
f5be1016fc Param refactor 2021-01-13 12:39:34 +01:00
Bjarke Berg
f496dadf23 Fix tests 2021-01-13 12:35:05 +01:00
Elitsa Marinovska
b572cf6809 Surrounding ModelState with the newly introduced SimpleValidationModel type 2021-01-13 11:39:44 +01:00
Elitsa Marinovska
2e62a6c5f2 Reverting the change of BadRequest() back to ValidationErrorResult 2021-01-13 11:29:56 +01:00
Bjarke Berg
86564682b0 Merge pull request #9642 from umbraco/netcore/feature/AB9725-Remove-IUmbracoApplicationLifetime_ApplicationInit 
AB#9725 - Removed IUmbracoApplicationLifetimeManager
 2021-01-13 11:12:59 +01:00
Elitsa Marinovska
2204a57a8d Signature changes of GetMenuForNode() & PerformGetMenuForNode() 2021-01-13 11:02:29 +01:00
Elitsa Marinovska
2c81d09d0e Replacing HttpResponseException in Attributes 2021-01-13 10:59:27 +01:00
Elitsa Marinovska
d6e90c7e7e Fixing ExamineManagementController with another way of replacing the usage of HttpResponseException 2021-01-13 10:57:49 +01:00
Elitsa Marinovska
9a9f9164e2 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/remove-httpresponseexception 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs
#	src/Umbraco.Web.BackOffice/Controllers/SectionController.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
 2021-01-13 08:53:41 +01:00
Bjarke Berg
8c8871a799 Cleanup 2021-01-13 08:30:35 +01:00
Shannon
2201a5a590 PureLiveModelFactory linting cleanup 2021-01-13 15:18:59 +11:00
Shannon
6fbe515adb Merge branch 'netcore/task/adding-tests-for-routing' into netcore/task/models-builder-9789 2021-01-13 14:49:43 +11:00
Shannon
62f3a80dc6 adds locks to culture providers when manipulating supported cultures 2021-01-13 14:46:59 +11:00
Shannon
f59c69b355 Merge branch 'netcore/task/adding-tests-for-routing' into netcore/task/models-builder-9789 2021-01-13 14:02:38 +11:00
Shannon
5afa49f170 adds notes 2021-01-13 13:59:34 +11:00
Shannon
52642a3914 remove aspx tests 2021-01-13 13:54:20 +11:00