yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,697 Commits 4 Branches 7 Tags
73f8ed7e120e4896151589453ec3bd4593d79289
Commit Graph

11875 Commits

Author SHA1 Message Date
Bjarke Berg
73f8ed7e12 Merge pull request #10539 from nikcio/temp-fix-urls 
Fix grid property editor view urls
 2021-06-28 14:56:01 +02:00
Bjarke Berg
6e9abb17e7 Merge remote-tracking branch 'origin/v8/dev' into v9/dev 
# Conflicts:
#	src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
#	src/Umbraco.Tests/Services/MediaServiceTests.cs
#	src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
 2021-06-28 08:57:38 +02:00
Nikcio
5776007e95 Fix grid property editor view urls 2021-06-26 12:34:46 +02: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
Mole
ea1091db7c Merge pull request #10235 from umbraco/v8/bugfix/AB10622-be-property-editor-caching 
Optimizations related to BlockEditorPropertyEditor.ToEditor()
 2021-06-24 08:39:12 +02:00
Sebastiaan Janssen
d8b7e24b7f Merge branch 'v8/8.14' into v8/dev 2021-06-22 12:24:18 +02:00
Patrick de Mooij
797a06e721 10429: Make sure to set filtered variable on media item 
(cherry picked from commit 8a810e698c)
 2021-06-22 10:46:39 +02:00
Mole
1d0a1cb7a9 Merge branch 'v8/dev' into v8/bugfix/AB10622-be-property-editor-caching 2021-06-22 10:43:58 +02:00
Bjarne Fyrstenborg
a69d4349d1 Support custom SVG icon in Nested Content (#10368) 
* Use custom SVG icon in Nested Content

* Get icon once

* Assign value instead of compare

(cherry picked from commit 340273a604)
 2021-06-21 19:34:09 +02:00
Bjarne Fyrstenborg
d0220c01f9 Use custom SVG icon in user group filter 
(cherry picked from commit 57cc3d5da2)
 2021-06-21 19:33:41 +02:00
Bjarne Fyrstenborg
5f94cb83ed Support custom SVG icon in grid editor row configuration (#10361) 
* Use custom svg icon in grid editor row configuration

* Use umb-icon in grid editor placeholder

* Use control icon in grid editor placeholder

* use umb-icon in itempicker to ensure svg icons are displayed

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
(cherry picked from commit f0e13e87d5)
 2021-06-21 19:32:23 +02:00
Warren Buckley
ee348be8a5 Merge pull request #10496 from umbraco/v8/fix/10483 
Fixes clashing aliases when new mediatypes had been installed

(cherry picked from commit f69cee87f9)
 2021-06-21 19:27:31 +02:00
Warren Buckley
79fc804a9b Merge pull request #10500 from umbraco/v8/fix/10423 
Don't obsolete the v2 pickers, renamed them and they're able to be created again, without config changes

(cherry picked from commit 69383d3dea)
 2021-06-21 19:27:13 +02:00
Mole
60df2ae34b Merge pull request #10415 from umbraco/v8/feature/packages-update 
Added "certified to work on Umbraco Cloud" indicator to packages section in the back-office
 2021-06-21 14:13:22 +02:00
Mole
ed79bd65f2 Fix certified to verified refactoring 2021-06-21 13:38:49 +02:00
Bjarke Berg
ff99e6c6fd https://github.com/umbraco/Umbraco-CMS/issues/10461 Removes hardcoded "Default" from view 2021-06-21 09:08:25 +02:00
Bjarke Berg
5eb9473657 https://github.com/umbraco/Umbraco-CMS/issues/10479 
https://github.com/umbraco/Umbraco-CMS/issues/10427

fixes issue with with saving data types
 2021-06-17 14:55:36 +02:00
Bjarke Berg
97a2318db2 Merge remote-tracking branch 'origin/v8/dev' into v9/dev 
# Conflicts:
#	src/Umbraco.Core/Runtime/CoreRuntime.cs
 2021-06-17 14:01:32 +02:00
Mads Rasmussen
585f7bb571 Make dashboards support deep linking (#10283) 
Co-authored-by: Ronald Barendse <ronald@barend.se>
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
 2021-06-17 09:40:07 +02:00
Warren Buckley
8d3434d7d8 dotnet new template - Escape JSON special characters for password & connection string (#10467) 
* Fix sourceName to match UmbracoProject and use a generated symbol to replace the Umbraco.Cms.Web.UI.NetCore in Program and Startup files

* Update template.json

* Run `npm update caniuse-lite`

* Regex replacement for Password & Connection strings that gets placed into AppSettings.Development.json So escaping \ and " for JSON strings

* Escaping input and handle namespace replacing. + Updated to beta004

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2021-06-15 09:42:52 +02:00
Sebastiaan Janssen
2b71951889 Merge branch 'v8/dev' into v9/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/package.json
 2021-06-14 14:15:07 +02:00
Warren Buckley
e70c362851 Run npm update caniuse-lite 2021-06-14 14:06:34 +02:00
Andy Butland
b5dad01fdc Update localisation alias to match default phrase. 2021-06-08 12:09:55 +02:00
Andy Butland
87eb224e5c Updated package listing to use umb-icon directive. 2021-06-08 11:55:58 +02:00
Andy Butland
dfae0adf3d Amended phrase for Cloud confirmed packages from "certified" to "verified". 2021-06-08 11:50:16 +02:00
Andy Butland
97bc301bf8 Adds the "works on Cloud" indicator to the package list and details screen in the back-office. 2021-06-08 10:08:27 +02:00
Andy Butland
c01b2c5807 Removed the "Umbraco Pro" category. 2021-06-08 07:51:08 +02:00
Shannon
3c3c9a6a47 Merge remote-tracking branch 'origin/v8/contrib' into v9/dev 
# Conflicts:
#	src/Umbraco.Core/Sync/DatabaseServerMessenger.cs
#	src/Umbraco.Core/Sync/DatabaseServerMessengerOptions.cs
#	src/Umbraco.Core/Sync/ISyncBootStateAccessor.cs
#	src/Umbraco.Core/Sync/NonRuntimeLevelBootStateAccessor.cs
#	src/Umbraco.Core/Sync/SyncBootState.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
#	src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
#	src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/de.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
#	src/Umbraco.Web/BatchedDatabaseServerMessenger.cs
#	src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
#	src/Umbraco.Web/HealthCheck/Checks/Config/AbstractConfigCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Config/NotificationEmailCheck.cs
#	src/Umbraco.Web/HealthCheck/HealthCheckAction.cs
#	src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs
#	src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
#	src/Umbraco.Web/Search/ExamineFinalComponent.cs
 2021-06-04 10:59:52 -07:00
Andy Butland
cd53d7a294 Removed hard-coded email validation for healthcheck fix value. (#5557) 
Made validation for healthchcls more flexible, supporting none, email and regex.

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
 2021-06-02 12:54:11 +10:00
Bjarne Fyrstenborg
57f7776848 Add input id so click on property label set focus in input (#9477) 
Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
 2021-06-02 11:20:56 +10:00
Bjarne Fyrstenborg
3c2e7759fb Support custom SVG icon in block list editor (#10365) 
* Use custom SVG icon in block card

* Adjust icons in block list editor views
 2021-06-02 11:00:01 +10:00
Bjarne Fyrstenborg
0990599c63 Support custom SVG icon in content app 2021-06-02 10:50:16 +10:00
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
Vlael Layug
1c630e3c5f inject clearAddUserForm() to inviteUser condition 2021-05-28 09:35:49 +02:00
Bjarne Fyrstenborg
2697431de6 Fix issue with extend of object in keyboard service 2021-05-28 17:10:21 +10:00
Bjarne Fyrstenborg
7cccbb3fbf Replaced angular.extend with Utilities.extend (#10023) 
* Replace angular.extend with Utilities.extend

* Replace more references of angular.extend with Utilities.extend

* Replace angular.extend

* Replace last reference of angular.extend except in Utilities itself

* Use spread operator

* Add spread operator

* Use existing format with empty destination object

* Configurate Babel to work with JS spread operator

* Use default for loose property which is "false"

* use alias for angular.extend - removes need for any other changes and makes multiple arguments easy

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
 2021-05-28 09:25:56 +10:00
patrickdemooij9
3440cbbac9 Fixed 10144: Prevalue alias not set (#10163) 
* Fixed 10144: Prevalue alias not set

* Remove console.log

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
 2021-05-28 09:14:07 +10:00
Sebastiaan Janssen
7d25439b09 Merge branch 'v8/dev' into v8/contrib 2021-05-27 12:28:01 +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
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
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
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
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
Nathan Woulfe
edef73fd39 Fix getBlueprintScaffold endpoint 2021-05-21 11:21:44 +10:00
Bjarne Fyrstenborg
710ecf2537 Add option to remove/cancel added crops (#10267) 
* Add option to remove/cancel added crops

* Move vm functions to top

* Only show cancel button for empty/new crop
 2021-05-20 09:00:23 +10: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
Sebastiaan Janssen
7b77d21d1b Merge branch 'v8/8.13' into v8/8.14 
# Conflicts:
#	src/SolutionInfo.cs
 2021-05-19 12:12:35 +02:00