swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,900 Commits 73 Branches 219 Tags
2ffb01530ab78e78067508f240c19fb7247a32d3
Commit Graph

5204 Commits

Author SHA1 Message Date
Bjarke Berg 2ffb01530a Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Core/Models/PublishedContent/IndexedArrayItem.cs
#	src/Umbraco.Infrastructure/Models/Mapping/CommonMapper.cs
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web/Compose/AuditEventsComponent.cs
#	src/Umbraco.Web/HtmlHelperRenderExtensions.cs
#	src/Umbraco.Web/HtmlStringUtilities.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
 2020-06-28 12:48:19 +02:00
Sebastiaan Janssen fee6ef0fb0 Merge branch 'v8/contrib' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
 2020-06-24 09:05:22 +02:00
Callum Whyte e96d2a30cc Removing legacy Examine.Config references from web.config template 2020-06-23 17:57:13 +02:00
Bjarne Fyrstenborg c4456c53a0 v8: Fix disappearing image cropper and grid content when using rollback (#5792) 2020-06-12 15:37:05 +02:00
Bjarke Berg d77c3dc8dd Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-06-11 15:16:39 +02:00
Warren Buckley e82f504658 Adds skipStepIfVisible property to JSON Tour Steps to allow skipping if DOM item is present (#8235) 
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
 2020-06-09 08:55:06 +02:00
Bjarke Berg dca04b3dd7 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
#	src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs
#	src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
#	src/Umbraco.Web/Models/Trees/MenuItemList.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/Trees/RelationTypeTreeController.cs
#	src/Umbraco.Web/UmbracoApplication.cs
 2020-05-29 12:59:42 +02:00
Sebastiaan Janssen 71fbf2769a Merge branch 'v8/dev' into v8/contrib 2020-05-29 09:03:35 +02:00
Warren Buckley 9df6a8bd6a Bugfix: Adds new confirmation email marketing step (#8091) 2020-05-27 16:59:15 +02:00
Jan Skovgaard cc04a1c8fe Content templates dashboard: Add translations and move styles external (#6888) 2020-05-26 18:01:17 +02:00
Jan Skovgaard 32a0c3b075 "Actions" drop down options do not give context to the user (#6301) 2020-05-26 17:45:39 +02:00
Kevin Jump c6055cf0e3 Add keys for custom audit events #8050 (#8051) 2020-05-11 15:39:12 +02:00
Bjarke Berg 3c622905ba Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Infrastructure/Models/Mapping/ContentTypeMapDefinition.cs
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
 2020-05-11 08:23:59 +02:00
Niels Lyngsø 7a1489923d Merge remote-tracking branch 'origin/v8/dev' into v8/feature/5656-ux-doctype-property-creation-journey 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/variables.less
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
 2020-05-06 09:45:47 +02:00
Scott Brady 5815bfa15f Merge remote-tracking branch 'Umbraco/netcore/dev' into netcore/feature/users 2020-05-04 14:36:45 +01:00
Bjarke Berg aa31a8b5dd Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
#	src/Umbraco.Core/PublishedCache/PublishedSnapshotServiceBase.cs
#	src/Umbraco.Core/PublishedModelFactoryExtensions.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
#	src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
 2020-05-01 14:13:15 +02:00
Niels Lyngsø 678ceba1a8 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB6057-segment-feature 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/servervalidationmgr.service.js
 2020-04-27 12:58:29 +02:00
Sebastiaan Janssen d65041c250 Merge branch 'v8/dev' into v8/contrib 2020-04-27 11:03:32 +02:00
Scott Brady 16a19b941e Merge remote-tracking branch 'Umbraco/netcore/dev' into netcore/feature/users 2020-04-22 15:58:54 +01:00
Shannon 46e14f7692 Fixes up all logging. Configures serilog logging to replace MS logging just like serilog does, adds new ILoggerConfiguration so we aren't hard coding things, dynamically adds enrichers when the container is ready to resolve services. 2020-04-22 14:23:56 +10:00
Scott Brady 96d9d3bd21 Removed use of Microsoft.AspNet.Identity.Owin, but had to port across some OWIN extensions 2020-04-20 20:14:36 +01:00
Bjarke Berg bf1784f9d1 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/ContentExtensions.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentRepository.cs
 2020-04-17 11:43:04 +02:00
Niels Lyngsø 291d5167b1 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB4550-segments-ui-variant-picker 2020-04-17 09:42:25 +02:00
Shannon d5e2c12685 fixes merge issue 2020-04-17 13:20:57 +10:00
Bjarke Berg 3406bdb40b Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	NuGet.Config
#	src/Umbraco.Core/Models/RelationType.cs
#	src/Umbraco.Infrastructure/PropertyEditors/MediaPickerPropertyEditor.cs
 2020-04-16 19:00:51 +02:00
Bjarke Berg d2f361e816 Merge remote-tracking branch 'origin/v8/8.6' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
 2020-04-16 18:54:45 +02:00
Bjarke Berg b09d736c1b Bump verison to 8.6.1 2020-04-16 13:47:23 +02:00
Niels Lyngsø 0e8591c728 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB4550-segments-ui-variant-picker 2020-04-16 07:52:43 +02:00
Mike Masey 23e32d2b59 improvement: update umb-tabs to use better semantic markup (#7926) 2020-04-10 20:42:43 +02:00
Jan Skovgaard 3e9c759426 Move the infinite overlay to the same source order as regular o… (#7923) 2020-04-10 17:41:31 +02:00
Mike 766a6df967 feat: add localisation for add new row button 2020-04-10 17:23:07 +02:00
Shannon 4349115f0d Fixes up some errors 2020-04-03 11:47:38 +11:00
Shannon 7e2d0902af Huge IIOHelper cleanup, removes some overlap with IHostingEnvironment, much less usages of IIOHelper and instead just use what is already available on IHostingEnvironment 2020-04-03 11:03:06 +11:00
Shannon 95a36b3064 Changes namesspace, fixes cdf registrations, fixes bundle registrations, cleanup 2020-04-02 21:19:42 +11:00
Shannon a67bb197b7 Merge branch 'netcore/feature/AB5822-smidge-implementation' of https://github.com/umbraco/Umbraco-CMS into netcore/feature/AB5822-smidge-implementation 2020-04-02 17:41:19 +11:00
Shannon 32deaa12d2 Removes unneeded methods/properties in abstraction, removes unneeded usages of it, changes everything to pre-defined bundles, fixes cdf implementation and reduces reflection, renames namespace 2020-04-02 17:41:00 +11:00
Bjarke Berg b1d214a13d Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5822-smidge-implementation 
# Conflicts:
#	src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
#	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
 2020-04-01 15:52:23 +02:00
Bjarke Berg e3ac778fc9 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Cache/WebCachingAppCache.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Infrastructure/PropertyEditors/UploadFileTypeValidator.cs
#	src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI/Umbraco/js/navigation.controller.js
#	src/Umbraco.Web/Macros/MacroRenderer.cs
#	src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
 2020-04-01 12:44:53 +02:00
Bjarke Berg 6012d6749e Fix views 2020-04-01 11:31:21 +02:00
Bjarke Berg e42c63693f AB#5822 Clean up 2020-03-31 16:43:01 +02:00
Bjarke Berg 6430137fe3 AB#5822 Clean up 2020-03-31 16:35:17 +02:00
Bjarke Berg 55426515c0 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5822-smidge-implementation 
# Conflicts:
#	src/Umbraco.Infrastructure/Media/ImageProcessorImageUrlGenerator.cs
#	src/Umbraco.Infrastructure/Models/ImageProcessorImageUrlGenerator.cs
#	src/Umbraco.Infrastructure/Models/ImageSharpImageUrlGenerator.cs
#	src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs
#	src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
#	src/Umbraco.Web.UI.NetCore/appsettings.json
 2020-03-31 15:36:25 +02:00
Bjarke Berg 117bfd1f12 AB#8522 - Smidge reset updates the version string to the current ticks 2020-03-31 10:47:08 +02:00
Bjarke Berg ffc6ce6553 AB#8522 - Smidge implementation of the Runtime Minifier 2020-03-30 21:27:35 +02:00
Sebastiaan Janssen 8cba80913a Remove generated files from git and ignore them 2020-03-30 13:38:17 +02:00
Bjarke Berg 1c53405d75 AB#5822 - Abstraction of runtime minifier 2020-03-25 20:42:02 +01:00
Bjarke Berg 9339e1d999 AB#5820 - Introduced WebProfiler for asp.net core 2020-03-24 18:56:45 +01:00
Elitsa Marinovska b23c508c54 Using Smidge inline bundle creation in view 2020-03-24 17:35:55 +01:00
Elitsa Marinovska ccfaebb09f More of the Smidge initial implementation. Adding TODOs for next steps 2020-03-24 17:34:34 +01:00
Elitsa Marinovska 5293a3c1b5 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5490-abstract-clientdependency 2020-03-23 12:50:16 +01:00