Bjarke Berg
4caa4e9e1c
Merge remote-tracking branch 'origin/netcore/dev' into netcore/dev
2021-04-20 19:37:24 +02:00
Bjarke Berg
b3a9730442
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
...
# Conflicts:
# build/NuSpecs/UmbracoCms.Web.nuspec
# src/SolutionInfo.cs
# src/Umbraco.Core/Cache/MediaCacheRefresher.cs
# src/Umbraco.Core/Composing/ComponentCollection.cs
# src/Umbraco.Core/Composing/Composers.cs
# src/Umbraco.Core/Composing/TypeFinder.cs
# src/Umbraco.Core/Composing/TypeLoader.cs
# src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs
# src/Umbraco.Core/Constants-SvgSanitizer.cs
# src/Umbraco.Core/ContentApps/ContentAppFactoryCollection.cs
# src/Umbraco.Core/Extensions/PublishedContentExtensions.cs
# src/Umbraco.Core/Extensions/PublishedPropertyExtension.cs
# src/Umbraco.Core/Extensions/StringExtensions.cs
# src/Umbraco.Core/HealthChecks/Checks/Security/ExcessiveHeadersCheck.cs
# src/Umbraco.Core/HealthChecks/HealthCheckResults.cs
# src/Umbraco.Core/IO/FileSystems.cs
# src/Umbraco.Core/IO/IOHelper.cs
# src/Umbraco.Core/IO/MediaFileSystem.cs
# src/Umbraco.Core/IO/PhysicalFileSystem.cs
# src/Umbraco.Core/Logging/DebugDiagnosticsLogger.cs
# src/Umbraco.Core/Logging/DisposableTimer.cs
# src/Umbraco.Core/Logging/ILogger.cs
# src/Umbraco.Core/Logging/LogProfiler.cs
# src/Umbraco.Core/Logging/OwinLogger.cs
# src/Umbraco.Core/Manifest/ManifestWatcher.cs
# src/Umbraco.Core/Mapping/UmbracoMapper.cs
# src/Umbraco.Core/Media/UploadAutoFillProperties.cs
# src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
# src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorCollection.cs
# src/Umbraco.Core/Models/Mapping/ContentPropertyBasicMapper.cs
# src/Umbraco.Core/Models/Mapping/DataTypeMapDefinition.cs
# src/Umbraco.Core/Models/Mapping/MacroMapDefinition.cs
# src/Umbraco.Core/Models/Member.cs
# src/Umbraco.Core/Packaging/PackageActionRunner.cs
# src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
# src/Umbraco.Core/PropertyEditors/Validators/EyeDropperColorPickerConfigurationEditor.cs
# src/Umbraco.Core/PropertyEditors/Validators/EyeDropperColorPickerPropertyEditor.cs
# src/Umbraco.Core/Routing/DefaultUrlProvider.cs
# src/Umbraco.Core/Runtime/CoreRuntime.cs
# src/Umbraco.Core/Runtime/MainDom.cs
# src/Umbraco.Core/RuntimeState.cs
# src/Umbraco.Core/Scoping/ScopeProvider.cs
# src/Umbraco.Core/Sync/DatabaseServerMessenger.cs
# src/Umbraco.Core/Templates/HtmlUrlParser.cs
# src/Umbraco.Core/UriExtensions.cs
# src/Umbraco.Examine.Lucene/UmbracoContentIndex.cs
# src/Umbraco.Examine.Lucene/UmbracoExamineIndex.cs
# src/Umbraco.Infrastructure/Examine/IndexRebuilder.cs
# src/Umbraco.Infrastructure/Manifest/DataEditorConverter.cs
# src/Umbraco.Infrastructure/Manifest/ManifestParser.cs
# src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
# src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
# src/Umbraco.Infrastructure/Migrations/MigrationPlan.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypeMigration.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DropDownPropertyEditorsMigration.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/MergeDateAndDateTimePropertyEditor.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/RadioAndCheckboxPropertyEditorsMigration.cs
# src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentRepositoryBase.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeRepository.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MediaRepository.cs
# src/Umbraco.Infrastructure/Persistence/UmbracoDatabase.cs
# src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseFactory.cs
# src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
# src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyEditor.cs
# src/Umbraco.Infrastructure/PropertyEditors/MultiUrlPickerValueEditor.cs
# src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
# src/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImages.cs
# src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/GridValueConverter.cs
# src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
# src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/JsonValueConverter.cs
# src/Umbraco.Infrastructure/PublishedCache/PublishedContentTypeCache.cs
# src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
# src/Umbraco.Infrastructure/Scoping/Scope.cs
# src/Umbraco.Infrastructure/Search/ExamineNotificationHandler.cs
# src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
# src/Umbraco.Infrastructure/Services/Implement/LocalizedTextService.cs
# src/Umbraco.Infrastructure/Services/Implement/LocalizedTextServiceFileSources.cs
# src/Umbraco.Infrastructure/Services/Implement/MediaService.cs
# src/Umbraco.Infrastructure/Services/Implement/NotificationService.cs
# src/Umbraco.Infrastructure/Sync/ServerMessengerBase.cs
# src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
# src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs
# src/Umbraco.PublishedCache.NuCache/ContentStore.cs
# src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEventsTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Mapping/MappingTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs
# src/Umbraco.Tests/Composing/TypeLoaderTests.cs
# src/Umbraco.Tests/LegacyXmlPublishedCache/DictionaryPublishedContent.cs
# src/Umbraco.Tests/LegacyXmlPublishedCache/LegacyBackgroundTask/BackgroundTaskRunner.cs
# src/Umbraco.Tests/LegacyXmlPublishedCache/PreviewContent.cs
# src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedMediaCache.cs
# src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
# src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStoreFilePersister.cs
# src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
# src/Umbraco.Tests/Services/PerformanceTests.cs
# src/Umbraco.Tests/TestHelpers/ConsoleLogger.cs
# src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
# src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
# src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
# src/Umbraco.Web.BackOffice/Controllers/DashboardController.cs
# src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs
# src/Umbraco.Web.BackOffice/HealthChecks/HealthCheckController.cs
# src/Umbraco.Web.BackOffice/PropertyEditors/RteEmbedController.cs
# src/Umbraco.Web.BackOffice/Services/IconService.cs
# src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web.Common/Extensions/FormCollectionExtensions.cs
# src/Umbraco.Web.Common/Install/InstallApiController.cs
# src/Umbraco.Web.Common/Macros/MacroRenderer.cs
# src/Umbraco.Web.Common/ModelsBuilder/PureLiveModelFactory.cs
# src/Umbraco.Web.UI.Client/package-lock.json
# src/Umbraco.Web.UI.Client/src/views/memberTypes/copy.controller.js
# src/Umbraco.Web.UI.Client/src/views/memberTypes/copy.html
# 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/config/splashes/noNodes.aspx
# src/Umbraco.Web/AspNet/AspNetHttpContextAccessor.cs
# src/Umbraco.Web/Cache/DistributedCacheBinder.cs
# src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs
# src/Umbraco.Web/Editors/AuthenticationController.cs
# src/Umbraco.Web/Editors/BackOfficeController.cs
# src/Umbraco.Web/Editors/Binders/ContentModelBinderHelper.cs
# src/Umbraco.Web/Editors/ContentControllerBase.cs
# src/Umbraco.Web/Editors/ContentTypeController.cs
# src/Umbraco.Web/Editors/DictionaryController.cs
# src/Umbraco.Web/Editors/MemberTypeController.cs
# src/Umbraco.Web/Editors/PasswordChanger.cs
# src/Umbraco.Web/Editors/RelationTypeController.cs
# src/Umbraco.Web/Editors/TinyMceController.cs
# src/Umbraco.Web/HealthCheck/Checks/Security/HttpsCheck.cs
# src/Umbraco.Web/HtmlHelperRenderExtensions.cs
# src/Umbraco.Web/HttpUrlHelperExtensions.cs
# src/Umbraco.Web/HybridEventMessagesAccessor.cs
# src/Umbraco.Web/ImageCropperTemplateExtensions.cs
# src/Umbraco.Web/JavaScript/ClientDependencyConfiguration.cs
# src/Umbraco.Web/Mvc/RenderMvcController.cs
# src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
# src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
# src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs
# src/Umbraco.Web/Routing/ContentFinderByIdPath.cs
# src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs
# src/Umbraco.Web/Routing/ContentFinderByUrl.cs
# src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
# src/Umbraco.Web/Routing/ContentFinderByUrlAndTemplate.cs
# src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
# src/Umbraco.Web/Routing/PublishedRouter.cs
# src/Umbraco.Web/Runtime/WebInitialComposer.cs
# src/Umbraco.Web/Scheduling/KeepAlive.cs
# src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
# src/Umbraco.Web/Scheduling/TempFileCleanup.cs
# src/Umbraco.Web/Security/MembershipHelper.cs
# src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
# src/Umbraco.Web/Trees/MemberTreeController.cs
# src/Umbraco.Web/Trees/MemberTypeAndGroupTreeControllerBase.cs
# src/Umbraco.Web/Trees/MemberTypeTreeController.cs
# src/Umbraco.Web/UmbracoApplicationBase.cs
# src/Umbraco.Web/UmbracoInjectedModule.cs
# src/Umbraco.Web/UmbracoModule.cs
# src/Umbraco.Web/WebApi/AngularJsonMediaTypeFormatter.cs
# src/Umbraco.Web/WebApi/Filters/FileUploadCleanupFilterAttribute.cs
# src/Umbraco.Web/WebApi/UnhandledExceptionLogger.cs
2021-04-20 19:34:18 +02:00
Bjarke Berg
5afc509d5e
Fix member cached macros and change macro rendering to be async
2021-04-20 14:26:25 +02:00
Sebastiaan Janssen
9fdbbb54fb
Update cypress test to make macros in the grid work again
2021-04-07 15:44:28 +02:00
Bjarke Berg
69548e0b33
Fixed new tests to match namespaces from v9
2021-03-24 18:37:26 +01:00
Bjarke Berg
202beba1bc
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
...
# Conflicts:
# src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
2021-03-24 16:05:10 +01:00
Mole
64724ac85b
Add indentation
2021-03-24 15:11:26 +01:00
Mole
70a582d1f0
Add new cypress tests
2021-03-24 15:04:34 +01:00
Bjarke Berg
ef9dc447cd
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
...
# Conflicts:
# src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/languages.ts
# src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
# src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
# src/Umbraco.Tests.AcceptanceTest/package.json
2021-03-24 15:03:03 +01:00
Mole
f0b39ce890
Align 'Add language' test to netcore
2021-03-24 10:57:02 +01:00
Mole
bffe1576d1
Try a fix for language tests
2021-03-24 10:06:15 +01:00
Mole
14c2bb4aa2
Update cypress and fix tests
2021-03-23 13:03:01 +01:00
Mole
25de77a8be
Up retries to 5 and set language name back to Afrikaans
2021-03-23 09:55:14 +01:00
Mole
f3aa3812c4
Remove videos if no test failed
2021-03-23 09:30:30 +01:00
Mole
d8555d501c
Add retries, fix two failing tests, and uncomment tablet & mobile tests
2021-03-23 08:51:48 +01:00
Bjarke Berg
37ed84871a
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
...
# Conflicts:
# build/NuSpecs/UmbracoCms.Core.nuspec
# build/NuSpecs/UmbracoCms.Web.nuspec
# src/SolutionInfo.cs
# src/Umbraco.Core/Cache/CacheKeys.cs
# src/Umbraco.Core/Composing/TypeFinder.cs
# src/Umbraco.Core/Configuration/GlobalSettings.cs
# src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs
# src/Umbraco.Core/Configuration/IGlobalSettings.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/ContentSectionExtensions.cs
# src/Umbraco.Core/Constants-AppSettings.cs
# src/Umbraco.Core/Editors/UserEditorAuthorizationHelper.cs
# src/Umbraco.Core/Extensions/StringExtensions.cs
# src/Umbraco.Core/Extensions/UriExtensions.cs
# src/Umbraco.Core/IO/IOHelper.cs
# src/Umbraco.Core/IO/PhysicalFileSystem.cs
# src/Umbraco.Core/Media/Exif/MathEx.cs
# src/Umbraco.Core/Media/UploadAutoFillProperties.cs
# src/Umbraco.Core/Models/Mapping/UserMapDefinition.cs
# src/Umbraco.Core/Models/Membership/User.cs
# src/Umbraco.Core/Models/UserExtensions.cs
# src/Umbraco.Core/Packaging/PackageDefinitionXmlParser.cs
# src/Umbraco.Core/PropertyEditors/ListViewConfiguration.cs
# src/Umbraco.Core/PropertyEditors/ValueConverters/MediaPickerValueConverter.cs
# src/Umbraco.Core/PropertyEditors/ValueConverters/MultiNodeTreePickerValueConverter.cs
# src/Umbraco.Core/Routing/AliasUrlProvider.cs
# src/Umbraco.Core/Routing/DefaultUrlProvider.cs
# src/Umbraco.Core/Routing/UriUtility.cs
# src/Umbraco.Core/Routing/UrlProviderExtensions.cs
# src/Umbraco.Core/Runtime/CoreRuntime.cs
# src/Umbraco.Core/RuntimeOptions.cs
# src/Umbraco.Core/RuntimeState.cs
# src/Umbraco.Core/Security/BackOfficeUserStore.cs
# src/Umbraco.Core/Security/ContentPermissions.cs
# src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
# src/Umbraco.Core/Trees/TreeNode.cs
# src/Umbraco.Core/Udi.cs
# src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
# src/Umbraco.Examine/Umbraco.Examine.csproj
# src/Umbraco.Infrastructure/Examine/ContentValueSetValidator.cs
# src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
# src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs
# src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
# src/Umbraco.Infrastructure/Scoping/Scope.cs
# src/Umbraco.Infrastructure/Search/ExamineComponent.cs
# src/Umbraco.Infrastructure/Security/IdentityMapDefinition.cs
# src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
# src/Umbraco.Infrastructure/Services/Implement/MediaService.cs
# src/Umbraco.Infrastructure/Services/Implement/NotificationService.cs
# src/Umbraco.Persistence.SqlCe/SqlCeSyntaxProvider.cs
# src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/LocksTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserExtensionsTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Editors/UserEditorAuthorizationHelperTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Examine/UmbracoContentValueSetValidatorTests.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
# src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
# src/Umbraco.Tests/Testing/TestDatabase.cs
# src/Umbraco.Tests/Web/Controllers/ContentControllerUnitTests.cs
# src/Umbraco.Tests/Web/Controllers/FilterAllowedOutgoingContentAttributeTests.cs
# src/Umbraco.Tests/Web/Controllers/MediaControllerUnitTests.cs
# src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
# src/Umbraco.Web.BackOffice/Controllers/CodeFileController.cs
# src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
# src/Umbraco.Web.BackOffice/Controllers/EntityController.cs
# src/Umbraco.Web.BackOffice/Controllers/MacrosController.cs
# src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
# src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs
# src/Umbraco.Web.BackOffice/Controllers/TourController.cs
# src/Umbraco.Web.BackOffice/Controllers/UserGroupEditorAuthorizationHelper.cs
# src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttribute.cs
# src/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingMediaAttribute.cs
# src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs
# src/Umbraco.Web.BackOffice/Services/IconService.cs
# src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs
# src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web.BackOffice/Trees/FileSystemTreeController.cs
# src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs
# src/Umbraco.Web.Common/Extensions/FormCollectionExtensions.cs
# src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
# src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
# 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/config/umbracoSettings.Release.config
# src/Umbraco.Web/Cache/MemberCacheRefresher.cs
# src/Umbraco.Web/Composing/ModuleInjector.cs
# src/Umbraco.Web/Editors/BackOfficeController.cs
# src/Umbraco.Web/Editors/Binders/ContentModelBinderHelper.cs
# src/Umbraco.Web/Editors/ContentTypeController.cs
# src/Umbraco.Web/Editors/Filters/ContentSaveValidationAttribute.cs
# src/Umbraco.Web/Editors/Filters/MediaItemSaveValidationAttribute.cs
# src/Umbraco.Web/Editors/Filters/UserGroupAuthorizationAttribute.cs
# src/Umbraco.Web/Editors/TinyMceController.cs
# src/Umbraco.Web/Editors/UserGroupsController.cs
# src/Umbraco.Web/Editors/UsersController.cs
# src/Umbraco.Web/ImageCropperTemplateExtensions.cs
# src/Umbraco.Web/Logging/WebProfiler.cs
# src/Umbraco.Web/Logging/WebProfilerProvider.cs
# src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
# src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
# src/Umbraco.Web/Mvc/JsonNetResult.cs
# src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs
# src/Umbraco.Web/Mvc/RenderRouteHandler.cs
# src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs
# src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
# src/Umbraco.Web/RoutableDocumentFilter.cs
# src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
# src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
# src/Umbraco.Web/Routing/PublishedRouter.cs
# src/Umbraco.Web/Runtime/WebInitialComposer.cs
# src/Umbraco.Web/Scheduling/KeepAlive.cs
# src/Umbraco.Web/Security/AppBuilderExtensions.cs
# src/Umbraco.Web/Security/BackOfficeClaimsIdentityFactory.cs
# src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
# src/Umbraco.Web/Trees/DictionaryTreeController.cs
# src/Umbraco.Web/Trees/LanguageTreeController.cs
# src/Umbraco.Web/Trees/LogViewerTreeController.cs
# src/Umbraco.Web/Trees/PackagesTreeController.cs
# src/Umbraco.Web/UmbracoApplication.cs
# src/Umbraco.Web/UmbracoApplicationBase.cs
# src/Umbraco.Web/UmbracoInjectedModule.cs
# src/Umbraco.Web/WebApi/Filters/AdminUsersAuthorizeAttribute.cs
# src/Umbraco.Web/WebApi/Filters/CheckIfUserTicketDataIsStaleAttribute.cs
# src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
# src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForMediaAttribute.cs
# src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs
2021-03-05 15:36:27 +01:00
berg
80a2b4c238
Fixed cypress test
2021-02-27 18:29:59 +01:00
Sebastiaan Janssen
5ee98919bc
Fix test where selector wasn't specific enough
2021-02-22 17:22:04 +01:00
Bjarke Berg
890cd45677
Fix namespace
2021-02-22 10:09:20 +01:00
Bjarke Berg
7dbb2dbf9a
Merge remote-tracking branch 'origin/v8/dev' into netcore/netcore
...
# Conflicts:
# src/Umbraco.Web.UI.Client/package-lock.json
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
2021-01-04 12:10:56 +01:00
Bjarke Berg
3f0f5c1449
Fixed tests and update testhelper
2020-12-18 12:23:44 +01:00
Mole
c2d38640ea
Remove duplicate square bracket
2020-12-02 14:31:23 +01:00
Mole
b6b17e4c9a
Update cypress to 6.0.1
2020-12-02 13:11:17 +01:00
Mole
cdd3905046
Add timeout to Create data type test
2020-12-02 10:10:48 +01:00
Bjarke Berg
85c01d9905
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
...
# Conflicts:
# src/Umbraco.Configuration/Legacy/GlobalSettings.cs
# src/Umbraco.Core/Configuration/IGlobalSettings.cs
# src/Umbraco.Core/Models/ContentBaseExtensions.cs
# src/Umbraco.Core/Routing/ContentFinderByRedirectUrl.cs
# src/Umbraco.Core/Routing/DefaultUrlProvider.cs
# src/Umbraco.Core/Runtime/MainDom.cs
# src/Umbraco.Core/Services/IRuntimeState.cs
# src/Umbraco.Infrastructure/Compose/NotificationsComponent.cs
# src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
# src/Umbraco.Infrastructure/RuntimeState.cs
# src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
# src/Umbraco.Tests/Runtimes/StandaloneTests.cs
# src/Umbraco.Tests/TestHelpers/TestObjects.cs
# src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs
# src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
# src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs
# src/Umbraco.Web.BackOffice/PropertyEditors/RteEmbedController.cs
# src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.cs
# 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/Rte.cshtml
# src/Umbraco.Web/Controllers/UmbLoginController.cs
# src/Umbraco.Web/Install/Controllers/InstallController.cs
# src/Umbraco.Web/PublishedElementExtensions.cs
# src/Umbraco.Web/Runtime/WebInitialComposer.cs
# src/Umbraco.Web/UmbracoHelper.cs
# src/Umbraco.Web/UmbracoInjectedModule.cs
# src/Umbraco.Web/UrlHelperExtensions.cs
# src/Umbraco.Web/UrlHelperRenderExtensions.cs
# src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs
2020-12-01 11:34:13 +01:00
Bjarke Berg
739194d71f
Post merge - Fix for acceptance tests
2020-12-01 11:02:11 +01:00
Bjarke Berg
e46a248832
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/6973-migrating-authenticationcontroller-merge
...
# Conflicts:
# src/Umbraco.Infrastructure/HostedServices/ScheduledPublishing.cs
# src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
# src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
# src/Umbraco.Infrastructure/Scheduling/SchedulerComposer.cs
# src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
# src/Umbraco.Tests/Testing/UmbracoTestBase.cs
# src/Umbraco.Web.BackOffice/Extensions/BackOfficeApplicationBuilderExtensions.cs
# src/Umbraco.Web.BackOffice/Runtime/BackOfficeComposer.cs
# src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
# src/Umbraco.Web.Common/UmbracoContext/UmbracoContext.cs
# src/Umbraco.Web.UI.NetCore/appsettings.json
# src/Umbraco.Web/Editors/BackOfficeController.cs
# src/Umbraco.Web/Runtime/WebInitialComponent.cs
2020-11-12 13:10:19 +01:00
Bjarke Berg
52550efc03
Fix language to a language that exists in .net core
...
Signed-off-by: Bjarke Berg <mail@bergmania.dk >
2020-11-04 13:56:44 +01:00
Shannon
1400a02798
Merge branch 'netcore/dev' into netcore/task/6973-migrating-authenticationcontroller
...
# Conflicts:
# src/Umbraco.Core/Constants-Security.cs
# src/Umbraco.Infrastructure/BackOffice/BackOfficeClaimsPrincipalFactory.cs
# src/Umbraco.Infrastructure/BackOffice/BackOfficeUserManager.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
# src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
# src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
# src/Umbraco.Web.BackOffice/Controllers/DenyLocalLoginAuthorizationAttribute.cs
# src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
# src/Umbraco.Web.BackOffice/Extensions/HtmlHelperBackOfficeExtensions.cs
# src/Umbraco.Web.BackOffice/Services/IconService.cs
# src/Umbraco.Web.Common/Security/ExternalSignInAutoLinkOptions.cs
# src/Umbraco.Web.UI.Client/src/common/interceptors/_module.js
# src/Umbraco.Web.UI.Client/src/common/interceptors/requiredheaders.interceptor.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.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/Views/AuthorizeUpgrade.cshtml
# src/Umbraco.Web/Editors/AuthenticationController.cs
# src/Umbraco.Web/Editors/BackOfficeController.cs
# src/Umbraco.Web/Editors/Filters/IsCurrentUserModelFilterAttribute.cs
# src/Umbraco.Web/Security/AppBuilderExtensions.cs
# src/Umbraco.Web/Security/AuthenticationOptionsExtensions.cs
# src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
2020-10-23 10:10:02 +11:00
Bjarke Berg
dc48fdb1e7
Merge pull request #8860 from umbraco/v8/feature/acceptance-test-scripts
...
Add javascript acceptance tests
2020-10-21 10:25:40 +02:00
Mole
79db8c2e99
Shorten password in members test
2020-10-09 10:53:23 +02:00
Mole
4485e76a28
Add forgotten indent
2020-10-09 10:44:52 +02:00
Mole
9039f3030b
Fix content with contentpicker after renaming doctype
2020-10-09 10:39:20 +02:00
Mole
2fcab52e7e
Indent nested builders
...
Makes it easier to see what calls belongs where
2020-10-09 10:07:04 +02:00
Mole
3e77457b81
Increase typing timeout in member tests and some minor cleaning
2020-10-09 09:49:09 +02:00
Mole
c8018ed00a
Add a timeout when getting the progress percentage
2020-10-08 15:19:54 +02:00
Mole
3c29982c09
Don't expect a certain order from badges in rollback
...
The badge order is not deterministic which means we can't expect them to be in a certain order.
2020-10-08 10:35:05 +02:00
Mole
a511575784
Assert that error notification does not come up on create template
...
Had the test pass sometimes before the fix because the success notification appear, but the error notification appear at well, so the test shouldn't actually have passed
2020-10-08 10:06:56 +02:00
Mole
030928f3a6
Unfocus and wait for save to be visible in templates
2020-10-08 09:35:16 +02:00
Mole
035b5beba7
Click the content area in create template test instead of making edit
...
Tests no longer fail with a weird The process cannot access the file, or well at least not in the 10 recurrent tries i just did.
2020-10-07 15:19:56 +02:00
Mole
3137c01ea1
Assert success notification after publishign content in rollback test
2020-10-07 13:04:23 +02:00
Mole
df607dbef8
Make rollback test pass again
2020-10-07 11:20:40 +02:00
Mole
7a42a84f7d
Merge remote-tracking branch 'origin/v8/dev' into v8/feature/acceptance-test-content-with-contentpicker
...
# Conflicts:
# src/Umbraco.Tests.AcceptanceTest/package.json
2020-10-07 11:08:04 +02:00
Bjarke Berg
b729c44505
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
...
# Conflicts:
# src/Umbraco.Web.BackOffice/Controllers/IconController.cs
# 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/Editors/BackOfficeModel.cs
# src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
2020-10-02 16:43:23 +02:00
Niels Lyngsø
b053ad1423
set to be required
2020-09-25 14:02:22 +02:00
Niels Lyngsø
b5374152a1
make baseUrl an optional part of configuration
2020-09-25 12:45:45 +02:00
Niels Lyngsø
4085468125
update dependency name
2020-09-25 12:01:40 +02:00
Niels Lyngsø
b46dad39ff
only write config if file does not already exist
2020-09-25 11:50:57 +02:00
Niels Lyngsø
78724c11eb
updated readme
2020-09-25 11:36:43 +02:00
Niels Lyngsø
9286282eca
updated text
2020-09-25 11:36:28 +02:00
