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

38702 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjarke Berg
641530df14 Introduced IProviderSpecificMapperFactory, to allow some NPoco mappers to only be applied for specific providers, e.g. SqlCe and the SqlCEImageMapper 2021-07-05 08:24:44 +02:00
Bjarke Berg
c8788ba996 Merge remote-tracking branch 'origin/v9/dev' into v9/dev 2021-07-01 12:09:40 +02:00
Bjarke Berg
03146090ac Added missing friendly extension method 2021-07-01 12:08:06 +02:00
Bjarke Berg
0aa54422f3 Merge pull request #10560 from umbraco/v9/bugfix/route-plugin-controllers-to-area 
V9: Route plugin controllers by area
 2021-07-01 10:25:13 +02:00
Mole
0835423e68 Replace surface with area name if surface controller has one 2021-06-30 14:36:34 +02:00
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
Bjarke Berg
2e3239ce6b Fix Benchmark project 2021-06-25 08:45:03 +02:00
Bjarke Berg
3baafbe230 Merge pull request #10530 from umbraco/v9/task/v8-chad-merge 
This is a merge PR which merges in #8376 to v9
 2021-06-25 08:14:04 +02:00
Shannon
91547dda75 Fix UrlHelperExtensions to use correct base path 2021-06-24 16:38:13 -06:00
Shannon
c7ad4a8d82 Fixes the acceptance tests "Content with contentpicker" 2021-06-24 13:36:54 -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
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
Warren Buckley
4c89d036ac Merge pull request #10519 from umbraco/v9/bugfix/10394_nucache_rebuild_issue 
V9: Fixes issue with "Rebuild" nucache not doing anything
 2021-06-23 13:33:58 +01:00
Bjarke Berg
df43b87f43 https://github.com/umbraco/Umbraco-CMS/issues/10394 - Fixes issue with "Rebuild" not really doing anything, because the "null" injected was not handled like "All", but instead ignored the type. 2021-06-23 11:31:08 +02:00
Bjarke Berg
cc495d66b1 Merge pull request #10512 from bjarnef/v9/feature/grid-partial-async 
Render grid editor partial async
 2021-06-23 10:45:40 +02:00
Bjarke Berg
8dc2cb3b52 Merge pull request #10511 from bjarnef/v9/feature/block-list-partial-async 
Render Block List component partial async
 2021-06-23 10:30:58 +02:00
Shannon
88ef1e081f merges v8 healthcheck changes from #5557 into netcore branch. 2021-06-22 15:02:34 -06:00
Shannon Deminick
74e12b5c3d Merge pull request #10509 from umbraco/v9/feature/updated_nuget_dependencies 
V9: Updated nuget dependencies
 2021-06-23 04:21:33 +10:00
Bjarne Fyrstenborg
83eed4c70f Formatting 2021-06-22 19:49:11 +02:00
Bjarne Fyrstenborg
44e9fb92e8 Adjust some whitespace 2021-06-22 19:42:42 +02:00
Bjarne Fyrstenborg
a7c5bdafe4 Render base grid editor partial async 2021-06-22 19:37:46 +02:00
Bjarne Fyrstenborg
ff65a333e1 Render grid partials async 2021-06-22 19:33:48 +02:00
Bjarne Fyrstenborg
b0657318c3 Render Block List component partial async 2021-06-22 19:07:24 +02:00
Bjarke Berg
1775b21591 Updated nuget dependencies 2021-06-22 15:41:24 +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
Bjarke Berg
c41d05f6a6 Merge remote-tracking branch 'origin/v9/9.0-beta004' into v9/9.0-beta004 2021-06-21 22:23:24 +02:00
Shannon Deminick
8cf8fb43a4 Merge pull request #10503 from umbraco/v9/task/smidge-update 
Updates to latest smidge and changes how debug assets work
 2021-06-22 06:22:03 +10:00
Shannon
a0cc6d904c Updates to latest Examine on nuget 2021-06-21 14:17:17 -06:00
Shannon
d818d3bc36 Updates to latest smidge and changes how debug assets work 2021-06-21 13:51:57 -06:00
Bjarke Berg
1b1a1f1f59 Fixed issue with MemberPicker not working if searching for specific member types. 2021-06-21 21:47:40 +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
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
Mole
5822af4510 Merge pull request #10489 from umbraco/v9/bugfix/fixed_extension_methods_to_use_IHtmlHelper_instead_of_HtmlHelper 
Moves extension methods from HtmlHelper to IHtmlHelper
 2021-06-17 15:33:24 +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
2bbaec6c2a Merge pull request #10491 from umbraco/v9/feature/v8_dev_latest 
V9: Merge v8/dev
 2021-06-17 14:53:08 +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
Bjarke Berg
6a35e0c62b Moves extension methods from HtmlHelper to IHtmlHelper 2021-06-17 11:04:16 +02:00