yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,399 Commits 4 Branches 7 Tags
46e14f769227453bc1ca806ed0dec2bb9157a2db
Commit Graph

5168 Commits

Author SHA1 Message Date
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
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
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
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
Bjarke Berg
73a1058dd1 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Models/Property.cs
 2020-03-23 12:48:56 +01:00
Sebastiaan Janssen
8cd537cc96 Merge branch 'v8/8.5.5' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2020-03-19 14:03:38 +01:00
Sebastiaan Janssen
5531c7300d Update dependency for 8.5.5 
(cherry picked from commit 2d3388d6d3)

# Conflicts:
#	src/SolutionInfo.cs
 2020-03-19 14:02:01 +01:00
Bjarke Berg
0efc335e4f Merge branch 'netcore/feature/imagesharp-config' into netcore/feature/aspnetcore-config 2020-03-17 15:38:35 +01:00
Bjarke Berg
6d8a23504e Remove resize parameters if larger than 5000 2020-03-17 11:39:55 +01:00
Elitsa Marinovska
7d2f5aee49 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5490-abstract-clientdependency 
# Resolved Conflicts:
#	src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
#	src/Umbraco.Web/Composing/Current.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
#	src/Umbraco.Web/Editors/PreviewController.cs
#	src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
 2020-03-17 11:01:32 +01:00
Elitsa Marinovska
4b7d823aca Injecting the abstraction whenever necessary 2020-03-17 10:28:03 +01:00
Bjarke Berg
ea15fdb14e Avoid usage of IOHelper in GlobalSettings 2020-03-13 10:00:03 +01:00
Warren Buckley
2d3388d6d3 Update dependency for 8.5.5 2020-03-12 15:52:23 +01:00
Bjarke Berg
c486444eda Cleaned up config for Content settings 2020-03-12 15:30:22 +01:00
Bjarke Berg
cb0994a929 Cleaned up config for Security settings 2020-03-12 14:36:25 +01:00
Bjarke Berg
e07c9abd58 Updated js code in UI project 2020-03-11 12:54:33 +01:00
Bjarke Berg
9d6762fb6a Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Models/PropertyType.cs
#	src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
#	src/Umbraco.Infrastructure/Models/Mapping/EntityMapDefinition.cs
#	src/Umbraco.Tests/Models/PropertyTypeTests.cs
 2020-03-10 08:25:43 +01:00
Warren Buckley
69483d03b6 Set version to 8.6.0 
.\build SetUmbracoVersion 8.6.0
 2020-03-09 09:57:22 +00:00
Andy Butland
8e3967c596 Merge branch 'netcore/dev' into netcore/77007-replace-no-nodes 
# Conflicts:
#	src/Umbraco.Core/Configuration/IGlobalSettings.cs
#	src/Umbraco.Core/Constants-Web.cs
 2020-03-06 07:28:13 +01:00
Bjarke Berg
290e5b58a0 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/executable-backoffice 
# Conflicts:
#	src/Umbraco.Web/Runtime/WebRuntime.cs
 2020-03-04 10:10:03 +01:00
Bjarke Berg
d53dd71204 Merge pull request #7750 from umbraco/netcore/feature/untangle-membership 
Netcore: Untangle membership helper and trim Web even more
 2020-03-04 08:20:25 +01:00
Bjarke Berg
bce196353e Fix view 2020-03-03 13:43:53 +01:00
cyberdot
efd8e37f34 Merge branch 'netcore/dev' into temp-7667 2020-03-03 12:05:31 +00:00
cyberdot
01362d0dd0 NetCore: Abstract ConfigurationManager references 2020-03-03 11:18:54 +00:00
Bjarke Berg
53769b42b3 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/untangle-membership 2020-03-03 12:01:54 +01:00
Elitsa Marinovska
84f19e093a NetCore: Refactor internal usages of UmbracoHelper (#7744) 
* Removing properties related to IPublishedContentQuery, ITagQuery, ICultureDictionaryFactory, IUmbracoComponentRenderer from UmbracoHelper and using the corresponding private fields instead. Removing Media related methods

* Removed UmbracoHelper from UmbracoApiControllerBase

* Removed UmbracoHelper references

* Inject the needed Interfaces to classes that previously used UmbracoHelper to get the same functionality

* Fixed tests referencing UmbracoHelper

* Adding Media methods back

* Cleanup and moved UmbracoHelper from more base classes, when not used + simplified tests

* Reintroduced some methods..

* Reintroduced some methods..

* Reintroducing last missing bits

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2020-03-03 11:59:17 +01:00
Bjarke Berg
81c975381f Merge branch 'netcore/dev' into netcore/feature/untangle-membership 
# Conflicts:
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
 2020-03-02 13:19:38 +01:00
Bjarke Berg
07238e277b Merge branch 'netcore/dev' into netcore/feature/executable-backoffice 2020-03-02 09:07:25 +01:00
Bjarke Berg
1ea39f2762 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
#	src/Umbraco.Core/Models/PublishedContent/PublishedContentBase.cs
#	src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
#	src/Umbraco.Core/Packaging/ConflictingPackageData.cs
#	src/Umbraco.Core/Packaging/PackagesRepository.cs
#	src/Umbraco.Core/PublishedCache/PublishedMember.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MacroRepository.cs
#	src/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImages.cs
#	src/Umbraco.PublishedCache.NuCache/PublishedContent.cs
#	src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs
#	src/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs
#	src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Trees/MediaTypeTreeController.cs
 2020-03-02 08:34:52 +01:00