Nikolaj Geisle
eca3536dc7
Merge pull request #10660 from vsilvar/v9/feature/modelsbuilders-nullable-references-maybenull
...
Added MaybeNullAttribute to ModelsBuilder generated files
2021-08-04 15:13:31 +02:00
Zeegaan
338e1e0d6d
https://github.com/umbraco/Umbraco-CMS/issues/10699 Changed HasSet<Uri> to ConcurrentHashSet<Uri>
...
and changed Add method to TryAdd in AspNetCoreHostingEnviroment.EnsureApplicationMainUrl()
to fix concurrency errors
2021-08-03 14:04:19 +02:00
deMD
c1dcdfa634
Changed ConfigConnectionString to accept more valid connectionstrings ( #10766 )
...
* Added test cases for valid connectionstring configuration and updated code to pass tests
* Removed unneeded reference added by reverted changes
Co-authored-by: Dave de Moel <d.demoel@wearetriple.com >
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk >
2021-08-03 10:04:49 +03:00
Mole
a5ee8566b8
Merge pull request #10655 from umbraco/v9/task/supress-notifications
...
Remove raiseEvent method parameters and allow suppressing events at the scope level
2021-07-15 09:36:58 +02:00
Shannon Deminick
7e8e96aaa3
Merge pull request #10646 from umbraco/v9/bugfix/runtime-hash-calculation
...
Fixes runtime hash calculation
2021-07-15 03:46:51 +10:00
Shannon
7913ae5463
fix test
2021-07-13 10:04:47 -06:00
Vitor Rodrigues
89e758127d
Updated ModelsBuilder unit tests
2021-07-13 10:15:03 +02:00
Shannon
bc84ffe260
Changes all collections from collection builders to resolve the concrete instances lazily.
...
This means we don't have to inject Lazy<T> all over the place when dealing with
colleciton builders and circular references since this will automatically just work OOTB.
This in theory should also allocate less instances during startup.
2021-07-12 15:28:46 -06:00
Shannon
ff9645c289
Updates usages.
2021-07-12 10:20:59 -06:00
Shannon
f7b8a93a35
Fixes typefinder/loader dependency refs, allows config to specify additional entry assemblies
2021-07-09 16:15:37 -06:00
Shannon
7ec3afa5ff
Adds new ctor to runtime hash class. Adds startup objects to the IUmbracoBuilder that are not otherwise available during configuration.
2021-07-09 15:31:01 -06:00
Shannon
6402a0ca8d
Merge remote-tracking branch 'origin/v9/dev' into v9/task/package-as-xml
2021-07-07 11:10:53 -06:00
Warren Buckley
8d936c08da
Change RenderController defautl type to be swapped out using the .NETCore options pattern
2021-07-07 12:52:02 +01:00
Shannon
f7123b355d
init commit for changing packages back to xml format so we can more easily deal with media.
2021-07-06 15:09:56 -06:00
Shannon
9178e28485
Merge branch 'v9/dev' into v9/task/package-refactor
...
# Conflicts:
# src/Umbraco.Web.BackOffice/Controllers/PackageController.cs
# src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs
2021-07-05 15:06:26 -06:00
Bjarke Berg
23293b77f6
Merge remote-tracking branch 'origin/v8/dev' into v9/feature/merge-v8-05072021
...
# Conflicts:
# build/NuSpecs/UmbracoCms.Web.nuspec
# src/SolutionInfo.cs
# src/Umbraco.Core/Compose/RelateOnTrashComponent.cs
# src/Umbraco.Core/Composing/Current.cs
# src/Umbraco.Core/Constants-AppSettings.cs
# src/Umbraco.Core/Constants-SqlTemplates.cs
# src/Umbraco.Core/Dashboards/ContentDashboardSettings.cs
# src/Umbraco.Core/Dashboards/IContentDashboardSettings.cs
# src/Umbraco.Core/Extensions/PublishedPropertyExtension.cs
# src/Umbraco.Core/HealthChecks/Checks/Services/SmtpCheck.cs
# src/Umbraco.Core/Models/IReadOnlyContentBase.cs
# src/Umbraco.Core/Models/Mapping/MemberTabsAndPropertiesMapper.cs
# src/Umbraco.Core/Models/Mapping/UserMapDefinition.cs
# src/Umbraco.Core/Models/ReadOnlyContentBaseAdapter.cs
# src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
# src/Umbraco.Core/PropertyEditors/IPropertyCacheCompression.cs
# src/Umbraco.Core/PropertyEditors/IPropertyCacheCompressionOptions.cs
# src/Umbraco.Core/PropertyEditors/MediaPicker3Configuration.cs
# src/Umbraco.Core/PropertyEditors/NoopPropertyCacheCompressionOptions.cs
# src/Umbraco.Core/PropertyEditors/PropertyCacheCompression.cs
# src/Umbraco.Core/Routing/UrlProviderExtensions.cs
# src/Umbraco.Core/Runtime/CoreRuntime.cs
# src/Umbraco.Core/Services/ILocalizedTextService.cs
# src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs
# src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
# src/Umbraco.Examine/UmbracoContentIndex.cs
# src/Umbraco.Infrastructure/Examine/GenericIndexDiagnostics.cs
# src/Umbraco.Infrastructure/IPublishedContentQuery.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
# src/Umbraco.Infrastructure/Models/MediaWithCrops.cs
# src/Umbraco.Infrastructure/Persistence/NPocoDatabaseExtensions.cs
# src/Umbraco.Infrastructure/Persistence/UmbracoDatabase.cs
# src/Umbraco.Infrastructure/PropertyEditors/ImageCropperConfiguration.cs
# src/Umbraco.Infrastructure/PropertyEditors/MediaPicker3PropertyEditor.cs
# src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
# src/Umbraco.Infrastructure/PropertyEditors/UploadFileTypeValidator.cs
# src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValue.cs
# src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MediaPickerWithCropsValueConverter.cs
# src/Umbraco.Infrastructure/PublishedContentQuery.cs
# src/Umbraco.Infrastructure/Search/UmbracoTreeSearcherFields.cs
# src/Umbraco.Infrastructure/Services/Implement/LocalizedTextService.cs
# src/Umbraco.Persistence.SqlCe/SqlCeSyntaxProvider.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/ContentData.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/ContentSourceDto.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/PropertyData.cs
# src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageCropperTest.cs
# src/Umbraco.Tests/App.config
# src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
# src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
# src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
# src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
# src/Umbraco.Web.BackOffice/Controllers/CodeFileController.cs
# src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
# src/Umbraco.Web.BackOffice/Controllers/ContentTypeControllerBase.cs
# src/Umbraco.Web.BackOffice/Controllers/DashboardController.cs
# src/Umbraco.Web.BackOffice/Controllers/DataTypeController.cs
# src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
# src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs
# src/Umbraco.Web.BackOffice/Controllers/TemplateQueryController.cs
# src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs
# src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web.BackOffice/Trees/DataTypeTreeController.cs
# src/Umbraco.Web.BackOffice/Trees/MediaTypeTreeController.cs
# src/Umbraco.Web.Common/Extensions/FriendlyImageCropperTemplateExtensions.cs
# src/Umbraco.Web.Common/Extensions/ImageCropperTemplateCoreExtensions.cs
# src/Umbraco.Web.Common/Macros/MacroRenderer.cs
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/it.xml
# src/Umbraco.Web.UI/web.Template.Debug.config
# src/Umbraco.Web.UI/web.Template.config
# src/Umbraco.Web/Compose/NotificationsComponent.cs
# src/Umbraco.Web/Composing/ModuleInjector.cs
# src/Umbraco.Web/Editors/AuthenticationController.cs
# src/Umbraco.Web/Editors/BackOfficeController.cs
# src/Umbraco.Web/Editors/ContentTypeController.cs
# src/Umbraco.Web/Editors/CurrentUserController.cs
# src/Umbraco.Web/Editors/DictionaryController.cs
# src/Umbraco.Web/Editors/MediaTypeController.cs
# src/Umbraco.Web/Editors/MemberController.cs
# src/Umbraco.Web/Editors/MemberGroupController.cs
# src/Umbraco.Web/Editors/MemberTypeController.cs
# src/Umbraco.Web/Editors/NuCacheStatusController.cs
# src/Umbraco.Web/Editors/UserGroupsController.cs
# src/Umbraco.Web/Editors/UsersController.cs
# src/Umbraco.Web/HealthCheck/Checks/Config/AbstractConfigCheck.cs
# src/Umbraco.Web/HealthCheck/Checks/Config/CompilationDebugCheck.cs
# src/Umbraco.Web/HealthCheck/Checks/Config/ConfigurationService.cs
# src/Umbraco.Web/HealthCheck/Checks/Config/CustomErrorsCheck.cs
# src/Umbraco.Web/HealthCheck/Checks/Config/MacroErrorsCheck.cs
# src/Umbraco.Web/HealthCheck/Checks/Config/NotificationEmailCheck.cs
# src/Umbraco.Web/HealthCheck/Checks/Config/TraceCheck.cs
# src/Umbraco.Web/HealthCheck/Checks/Config/TrySkipIisCustomErrorsCheck.cs
# src/Umbraco.Web/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs
# src/Umbraco.Web/HealthCheck/Checks/Security/BaseHttpHeaderCheck.cs
# src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
# src/Umbraco.Web/HealthCheck/Checks/Security/HttpsCheck.cs
# src/Umbraco.Web/HealthCheck/NotificationMethods/EmailNotificationMethod.cs
# src/Umbraco.Web/Models/Trees/MenuItemList.cs
# src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentCacheDataModel.cs
# src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
# src/Umbraco.Web/PublishedCache/NuCache/DataSource/SerializerBase.cs
# src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs
# src/Umbraco.Web/Runtime/WebRuntime.cs
# src/Umbraco.Web/Search/ExamineComponent.cs
# src/Umbraco.Web/Trees/ApplicationTreeController.cs
# src/Umbraco.Web/Trees/MemberTreeController.cs
# src/Umbraco.Web/UrlHelperRenderExtensions.cs
2021-07-05 20:58:04 +02:00
Bjarke Berg
f1b91ab35d
post merge fixes
2021-06-30 06:59:47 +02:00
Bjarke Berg
9e4dead0f5
Merge remote-tracking branch 'origin/v9/dev' into v9/task/package-refactor
...
# Conflicts:
# src/Umbraco.Core/Migrations/IMigration.cs
# src/Umbraco.Core/Migrations/MigrationPlan.cs
# src/Umbraco.Infrastructure/Migrations/IMigrationContext.cs
# src/Umbraco.Infrastructure/Runtime/RuntimeState.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationTests.cs
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
2021-06-29 14:23:08 +02:00
Shannon
055dacbb0e
Streamlines validation response handling in controllers
...
This makes validation response handling more inline with aspnetcore patterns.
2021-06-25 10:29:18 -06:00
Shannon
3d5d04550a
fix broken migration abstraction, fixes restart after upgrade so the runtimestate is correct, fixes sql alter column migration to actually run if its nullable.
2021-06-24 13:35:57 -06:00
Shannon
d6a6016801
implement noop published snapshot service, splits tests models for published content, fixes sqlce image mapper to not have circular ref.
2021-06-24 10:25:23 -06:00
Shannon
72671dbca8
Merge commit '94d525d88f713b36419f28bfda4d82ee68637d83' into v9/dev
...
# Conflicts:
# build/NuSpecs/UmbracoCms.Web.nuspec
# src/Umbraco.Core/Composing/Current.cs
# src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
# src/Umbraco.Core/Runtime/CoreRuntime.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
# src/Umbraco.Infrastructure/Persistence/NPocoDatabaseExtensions.cs
# src/Umbraco.Infrastructure/Persistence/UmbracoDatabase.cs
# src/Umbraco.Persistence.SqlCe/SqlCeSyntaxProvider.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/ContentCacheDataModel.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/ContentCacheDataSerializationResult.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/ContentCacheDataSerializerEntityType.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/ContentData.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/ContentNestedData.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/CultureVariation.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/IContentCacheDataSerializer.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/IContentCacheDataSerializerFactory.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/IDictionaryOfPropertyDataSerializer.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/JsonContentNestedDataSerializer.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/JsonContentNestedDataSerializerFactory.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/LazyCompressedString.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/MsgPackContentNestedDataSerializer.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/MsgPackContentNestedDataSerializerFactory.cs
# src/Umbraco.PublishedCache.NuCache/DataSource/PropertyData.cs
# src/Umbraco.PublishedCache.NuCache/NuCacheSerializerComponent.cs
# src/Umbraco.PublishedCache.NuCache/NuCacheSerializerComposer.cs
# src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs
# src/Umbraco.Tests/App.config
# src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
# src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
# src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/web.Template.Debug.config
# src/Umbraco.Web.UI/web.Template.config
# src/Umbraco.Web/Composing/ModuleInjector.cs
# src/Umbraco.Web/Editors/NuCacheStatusController.cs
# src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentNestedData.cs
# src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
# src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs
# src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
# src/Umbraco.Web/Runtime/WebRuntime.cs
2021-06-24 09:43:57 -06:00
Bjarke Berg
1775b21591
Updated nuget dependencies
2021-06-22 15:41:24 +02:00
Shannon
b1c6b02dd7
Merge remote-tracking branch 'origin/v9/task/package-refactor' into v9/task/package-migrations-backoffice
...
# Conflicts:
# src/Umbraco.Core/Extensions/XmlExtensions.cs
# src/Umbraco.Core/Packaging/PackageMigrationPlan.cs
# src/Umbraco.Infrastructure/Runtime/RuntimeState.cs
2021-06-18 12:48:44 -06:00
Bjarke Berg
1ef72d2522
Merge remote-tracking branch 'origin/v9/dev' into v9/task/package-refactor
...
# Conflicts:
# src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs
# src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
# src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
# src/Umbraco.Web.UI.Client/package-lock.json
2021-06-18 13:19:48 +02:00
Bjarke Berg
43af29f139
Merge pull request #10393 from umbraco/v9/feature/email-display-name-in-notifiaction
...
V9: Add new email Model for notifications
2021-06-17 15:39:14 +02:00
Shannon
ad84c1591e
Starts implementing ability to manually run pending migrations from the back office
2021-06-16 15:34:20 -06:00
Bjarke Berg
575e66b8eb
Merge remote-tracking branch 'origin/v9/dev' into netcore/feature/get_rid_of_ICoreComposer
...
# Conflicts:
# src/Umbraco.Examine.Lucene/ExamineLuceneComposer.cs
# src/Umbraco.Examine.Lucene/ExamineLuceneConfigureIndexes.cs
# src/Umbraco.Examine.Lucene/ExamineLuceneFinalComposer.cs
# src/Umbraco.Examine.Lucene/ExamineLuceneStarting.cs
# src/Umbraco.Infrastructure/Compose/NotificationsComposer.cs
# src/Umbraco.PublishedCache.NuCache/Compose/NotificationsComposer.cs
# src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
# src/Umbraco.Web.UI.Client/package-lock.json
2021-06-15 19:13:06 +02:00
Shannon Deminick
de2fb47b78
Implements unattended package migrations for both explicit and implicit migrations ( #10418 )
...
* Clean up and changes to backoffice for the nuget only packages
* temp commit of package logic removal
* Lots of package code cleanup and removal
* Removes old package data from the test package xml
* Updates packaging code to take in XDocument instead of a file since we'll not be dealing with files, starts creating expressions for the package migrations scripting.
* fixing tests
* Fixes runtime state and boot failed middleware so that it actually runs. Separates out unattended install/upgrade into notification handlers.
* Gets unattended package migrations working and running
* Gets embedded package.xml resources able to install from package migration.
* Implements automatic package migrations for package that just declare an xml data manifest.
* fix build
* small cleanups
* fix build
* adds some tests
* Fix export test
* Fix newlines in test for linux
* Typo
* removes old todos and updates AutomaticPackgeMigrationPlan to use getter with backing field.
Co-authored-by: Bjarke Berg <mail@bergmania.dk >
2021-06-15 07:05:57 +02:00
Shannon
0268793b2d
adds some tests
2021-06-11 13:07:41 -06:00
Shannon
e8201a09ef
fix build
2021-06-11 12:08:09 -06:00
Shannon
14806bc293
Lots of package code cleanup and removal
2021-06-09 15:18:47 -06:00
Shannon Deminick
8eb0f45cf2
Refactor MigrationPlan to separate the executor from the plan itself. ( #10417 )
...
* Refactor MigrationPlan to separate the executor from the plan itself.
* cleanup
2021-06-09 08:18:15 +02:00
Shannon
4f6e491c5f
Refactor MigrationPlan to separate the executor from the plan itself.
2021-06-08 10:07:57 -06:00
Shannon
bb793422f2
Removes package actions
2021-06-07 17:49:20 -06:00
Warren Buckley
c23efec854
.NETCore & SQL Docker Image for Container Isolated Development & GitHub CodeSpaces ( #9835 )
...
* .NETCore & SQL Docker Image
https://github.com/microsoft/vscode-dev-containers/tree/master/containers/dotnet-mssql
* Set the C# extension aka Omnisharp to use the umbraco-netcore-only.sln
* A new script in the postCreate of the docker image to npm install client stuff and initial dotnet build of SLN to help just running straight away
* Remove bash script - doing npm install stuff & dotnet build was hard to see log output and taking longer for image to start
* Adds in port 9000 and friendly label
* Ensure user notified about auto port forward with notification
* Comment out image min of assets as causing problems and eating way too much time up atm - need to revisit
* Automated launch & tasks VSCode JSON files - updated to run client npm install and npm run build before running website
* Update .gitattributes for line ending help for codespaces
https://code.visualstudio.com/docs/remote/troubleshooting#_resolving-git-line-ending-issues-in-containers-resulting-in-many-modified-files
* Tidy up
* Remove npm install from the npm run build step - kinda annoying when you re-run it
* Rather everytime attaching the debugger doing a full npm install, gulp dev and dotnet build is overkill, just build the SLN before debugging
* Update gitignore with casing rules
* Revert "Update .gitattributes for line ending help for codespaces"
This reverts commit 28316d1ba8a552751eef2f211b68531484344153.
* Sets the global user for npm as root
https://stackoverflow.com/a/45505787
* File permission stuff for NPM & Gifsicle binary source compilation from gulp-imagemin
* Revert "Comment out image min of assets as causing problems and eating way too much time up atm - need to revisit"
This reverts commit be48db9653bc58a69422d131b65955985e115e29.
* Add chromium-browser to try & get JS tests to run happy in CodeSpaces
* Set DB connection string & unattended install config to true so we can skip installer flow
* Add in ENV variables to setup the unattended install user
* Try to add SMTP4Dev from Bjarke Recommendation
* Need to specify the port mappings for SMTP4Dev
* Lovely syntax error in docker compose file
* Update ENV variables to renamed settings now this feature merged into NETCore branch by Bjarke
* Needed to match the hostname that SMTP4Dev was listening on, had assumed it would be reachable via localhost
* Fix folder naminng to make UNIX happy running JS tests
Co-authored-by: Bjarke Berg <mail@bergmania.dk >
2021-06-07 13:23:15 +02:00
Mole
96f88ac990
Apply suggestions from PR
2021-06-04 15:47:34 +02:00
Mole
a56de298a3
Allow fallback to configured email
2021-06-04 14:18:49 +02:00
Mole
baf13adef8
Don't convert to MimeMessage
2021-06-04 13:10:28 +02:00
Mole
ba129b045b
Add unit tests
2021-06-04 11:39:25 +02:00
Mole
3d0a72c39b
Allow fallback to configured sender
2021-06-04 11:17:35 +02:00
Mole
6a79053a9f
Move email models into a folder
2021-06-04 09:50:49 +02:00
Andy Butland
1f97ee8bcf
Adds fields to unit test model builder for data editors. ( #10363 )
2021-06-01 08:15:59 +02:00
Mole
40c8bf62f7
Enable email sender to publish an event if smtp is not configured ( #10352 )
2021-06-01 06:41:56 +02:00
Bjarke Berg
761c7dcfc6
Merge remote-tracking branch 'origin/v8/dev' into v9/dev
...
# Conflicts:
# build/NuSpecs/UmbracoCms.Web.nuspec
# src/Umbraco.Core/Dashboards/DashboardCollectionBuilder.cs
# src/Umbraco.Examine/Umbraco.Examine.csproj
# src/Umbraco.Examine/UmbracoExamineIndex.cs
# src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
# src/Umbraco.TestData/LoadTestController.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/CollectionBuildersTests.cs
# src/Umbraco.Web.UI.Client/package-lock.json
# src/Umbraco.Web.UI.Client/package.json
# 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/KeepAliveController.cs
# src/Umbraco.Web/Routing/PublishedContentNotFoundHandler.cs
2021-05-21 12:32:39 +02:00
Bjarke Berg
3aaf53ce0e
Merge pull request #10299 from umbraco/v9/feature/allow-custom-notification-publisher-in-scope
...
V9: Allow custom notification publisher in scope
2021-05-21 11:07:32 +02:00
Bjarke Berg
9aee6919d7
Merge pull request #10286 from umbraco/v9/feature/do_not_restart_doing_simple_installs_without_package_installation
...
V9: Do not restart doing simple installs without package installation
2021-05-20 21:36:55 +02:00
Mole
ee66455057
Add unit tests for custom scoped notification publisher
2021-05-20 13:00:59 +02:00
Mole
6596bcf557
Inject notification publisher from CreateScope
2021-05-20 12:36:57 +02:00
Bjarke Berg
025a7aca29
Updated nuget packages
2021-05-19 21:44:33 +02:00