Commit Graph

38556 Commits

Author SHA1 Message Date
Bjarke Berg
8a0a6e62bf Merge remote-tracking branch 'origin/v8/dev' into v9/dev
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Cache/DataTypeCacheRefresher.cs
#	src/Umbraco.Core/Extensions/PublishedContentExtensions.cs
#	src/Umbraco.Core/Extensions/PublishedPropertyExtension.cs
#	src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
#	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
2021-05-31 15:10:49 +02:00
Sebastiaan Janssen
704f15aa9d Merge branch 'v8/8.14' into v8/dev 2021-05-31 09:42:34 +02:00
Sebastiaan Janssen
d1130a43ab Merge branch 'v8/8.13' into v8/8.14 2021-05-31 09:42:15 +02:00
Sebastiaan Janssen
4f3ab4fd99 Merge branch 'v8/8.12' into v8/8.13
# Conflicts:
#	src/SolutionInfo.cs
2021-05-31 09:41:48 +02:00
Sebastiaan Janssen
0653dcb849 Merge branch 'v8/8.11' into v8/8.12
# Conflicts:
#	src/SolutionInfo.cs
2021-05-31 09:40:59 +02:00
Sebastiaan Janssen
042e296d8f Bump version to 8.12.3 2021-05-31 09:21:44 +02:00
Sebastiaan Janssen
fc417e8ed8 Bump version to 8.11.3 2021-05-31 09:18:12 +02:00
Sebastiaan Janssen
a27c6a7404 Merge branch 'v8/8.14' into v8/dev 2021-05-27 12:27:40 +02:00
Sebastiaan Janssen
d81fac9753 Bump version to 8.14.0 2021-05-27 10:42:23 +02:00
Sebastiaan Janssen
a845d2bffd Shows a warning for people tempted to switch to the new media picker 2021-05-27 10:41:56 +02:00
Bjarke Berg
7a63e26785 Add missing IMigrationContext to RebuildPublishedSnapshot ctor 2021-05-26 18:31:03 +02:00
Warren Buckley
9ef806d4e9 Rename Media Picker 3 and make current Media Picker Obsolete (#10332) 2021-05-26 16:13:25 +02:00
Mads Rasmussen
008e76c08f fixes #10297 8.14-RC - A few areas where focus lock doesn't work properly 2021-05-26 14:32:59 +02:00
Sebastiaan Janssen
046cbfc230 Merge branch 'v8/8.13' into v8/8.14 2021-05-26 14:21:40 +02:00
Sebastiaan Janssen
15f9814322 Merge branch 'v8/8.12' into v8/8.13 2021-05-26 13:47:01 +02:00
Sebastiaan Janssen
e0958e3b6b Merge branch 'v8/8.11' into v8/8.12 2021-05-26 13:44:45 +02:00
Niels Lyngsø
1ac44542f6 Complex validation for RTE property editor (#10328)
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
(cherry picked from commit 0a9c1c7c8e)

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
2021-05-26 13:10:18 +02:00
Niels Lyngsø
0a9c1c7c8e Complex validation for RTE property editor (#10328)
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
2021-05-26 13:08:25 +02:00
Callum Whyte
b07f6519e7 Rename models builder modes (#10272)
* Renaming AppData Models Builder mode

* Renaming PureLive Models Builder mode to Runtime

* ModelsBuilderAssembly attribute flags if models are "Live" or not

* Updated ModelsMode names

* Only add tag if it is not a pull request. Apparently this is not allowed when it is from a fork.

* Revert "Only add tag if it is not a pull request. Apparently this is not allowed when it is from a fork."

This reverts commit 92b33f3c

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2021-05-26 08:36:21 +02:00
Warren Buckley
0358e2aff7 Merge pull request #10320 from umbraco/v9/bugfix/10295-fix_issue_with_determining_the_uploaded_media_type
V9: Fix issue with determining the uploaded media type
2021-05-25 15:04:40 +01:00
Niels Lyngsø
630fa6a989 dont remove outline 2021-05-25 15:07:42 +02:00
Niels Lyngsø
a68a6b2ac2 added windowResizeListener 2021-05-25 15:06:58 +02:00
Niels Lyngsø
ecdc687e39 use label 2021-05-25 15:05:45 +02:00
Bjarke Berg
3b8f9d5e33 https://github.com/umbraco/Umbraco-CMS/issues/10295 - Use FileUploadConfigurationEditor in FileUploadPropertyEditor 2021-05-25 08:53:13 +02:00
Bjarke Berg
2ab02f9afa Merge pull request #10314 from umbraco/v9/bugfix/safe-template-namespace
NETCore: Fix dotnet new template for safe namespaces
2021-05-25 08:05:26 +02:00
Warren Buckley
e02ccebf75 No need for a specific namespace replacer it seems sourceName prop is used for that 2021-05-24 14:39:06 +01:00
Warren Buckley
6aca1ca12e Fix for invalid chars used in dotnet new templates creations to ensure namespace is valid & compiles 2021-05-23 13:33:28 +01:00
Sebastiaan Janssen
9f51de5373 Merge branch 'v8/8.14' into v8/dev 2021-05-21 15:06:49 +02:00
Sebastiaan Janssen
0a9325c3d6 Merge branch 'v8/8.13' into v8/8.14
# Conflicts:
#	src/SolutionInfo.cs
2021-05-21 15:06:28 +02:00
Sebastiaan Janssen
008480a17b Can't use optimized version of this method call until 8.14 2021-05-21 15:01:51 +02:00
Andy Butland
12328ba2f7 Fixed issue with data types not being cleared in cache refresh operations.
(cherry picked from commit 71a1817a06)
2021-05-21 14:27:13 +02:00
Andy Butland
71a1817a06 Fixed issue with data types not being cleared in cache refresh operations. 2021-05-21 14:26:33 +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
34519c7233 Merge pull request #10302 from nathanwoulfe/nathanwoulfe-patch-2
Fix getBlueprintScaffold endpoint
2021-05-21 11:11:29 +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
Nathan Woulfe
edef73fd39 Fix getBlueprintScaffold endpoint 2021-05-21 11:21:44 +10: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
Bjarke Berg
9b2cf8422d Removed unused ctor (just for tests) + Fixed a couple of handlers that is not intended to execute before runtime level = run. 2021-05-20 13:16:50 +02:00
Mole
ee66455057 Add unit tests for custom scoped notification publisher 2021-05-20 13:00:59 +02:00
Bjarke Berg
0a3b39cc38 Merge remote-tracking branch 'origin/v9/dev' into v9/feature/do_not_restart_doing_simple_installs_without_package_installation 2021-05-20 12:56:41 +02:00
Bjarke Berg
35f439f5c5 Merge pull request #10294 from umbraco/v9/feature/update-nuget-packages
Update nuget packages
2021-05-20 12:55:03 +02:00
Mole
6596bcf557 Inject notification publisher from CreateScope 2021-05-20 12:36:57 +02:00
Sebastiaan Janssen
9bf01741b6 Fix invalid XML 2021-05-20 09:29:45 +02:00
Bjarke Berg
025a7aca29 Updated nuget packages 2021-05-19 21:44:33 +02:00
Bjarke Berg
3af19b43d0 Merge pull request #10291 from umbraco/v9/bugfix/fix_unattended_installs
Bugfix: Acquire the maindom before we do unattended installs
2021-05-19 21:08:37 +02:00
Bjarke Berg
80ee7b398c Acquire the maindom before we do unattended installs 2021-05-19 20:40:06 +02:00
Bjarke Berg
cb6f74774d No not use explicit nuspec file for Examine.Lucene anymore :) 2021-05-19 19:12:13 +02:00
Sebastiaan Janssen
3f596e27cc Bump version to 8.13.1 2021-05-19 16:31:52 +02:00
Bjarke Berg
df6d4a603e Fix lucene reference for linux too 2021-05-19 15:05:30 +02:00
Niels Lyngsø
9730a18c9b #10274 Variant sorting should take into account that there might not be any language (#10278) (#10284)
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
Co-authored-by: Mads Rasmussen <madsr@hey.com>
(cherry picked from commit 017b56eee1)
2021-05-19 12:12:58 +02:00