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

254 Commits

Author SHA1 Message Date
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
Bjarke Berg
9f56aa1358 Merge remote-tracking branch 'origin/netcore/dev' into feature/7898-netcore-model-unit-tests-3 2020-04-16 19:28:05 +02: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
Andy Butland
2278b0d318 Merge branch 'netcore/dev' into feature/7898-netcore-model-unit-tests-3 2020-04-16 12:19:04 +02:00
Bjarke Berg
ad4bce3b73 AB#5819 - Cleanup 2020-04-14 16:26:01 +02:00
Bjarke Berg
d0135eae2b Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/ab5819-initialize-composers 2020-04-14 07:29:59 +02:00
Andy Butland
4456a784b0 Migrated user extension tests new project pattern. 2020-04-11 16:41:28 +02:00
Bjarke Berg
8aaff38a6d Merge pull request #7895 from AndyButland/feature/netcore-model-unit-tests 
Netcore: Further model unit test migrations into new project and builder pattern
 2020-04-10 16:28:19 +02:00
Shannon
d56867757c Merge branch 'netcore/dev' into netcore/feature/ab5819-initialize-composers 2020-04-08 15:59:00 +10:00
Shannon
f19e18e160 Removes new namespaces: Umbraco.Core.Cookie, Umbraco.Core.Session, Umbraco.Core.Request, these are web things and should be part of one namespace 2020-04-08 15:56:19 +10:00
Paul Johnson
b2f1c728fb Alter resx to match filesystem 2020-04-07 16:54:54 +01:00
Andy Butland
58a1bc0a8f Migrated stylesheet and template tests into new project and builder pattern. 2020-04-04 09:32:23 +02:00
Bjarke Berg
7c87ec3141 Merge remote-tracking branch 'origin/netcore/feature/AB5822-smidge-implementation' into netcore/feature/ab5819-initialize-composers 2020-04-03 10:12:10 +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
fa2e9c3715 Fixing AspNetCoreHostingEnvironment, cleaning up more IOHelper, adds notes 2020-04-03 09:13:55 +11:00
Shannon
9d320f79da New IRuntimeHash to fix type scanning in netcore in order to look at the right runtime bits to creaet a hash for 2020-04-03 01:08:52 +11:00
Shannon
f0579714e9 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5822-smidge-implementation 
# Conflicts:
#	.gitignore
#	src/Umbraco.Core/IO/IIOHelper.cs
 2020-04-02 22:32:02 +11:00
Shannon
4fddb94462 Fixes up preview paths, adds more docs and ensures we throw exceptions when not absolute paths 2020-04-02 22:11:57 +11:00
Shannon
4eb116d4ac removes CssInitialization and JsInitialization and merges/simplifies code 2020-04-02 21:29:48 +11:00
Shannon
95a36b3064 Changes namesspace, fixes cdf registrations, fixes bundle registrations, cleanup 2020-04-02 21:19:42 +11:00
Bjarke Berg
01957b7c64 Merge remote-tracking branch 'origin/netcore/dev' into netcore/bugfix/integration-tests-running 2020-04-02 10:01:57 +02: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
38c41fa0bd Merge branch 'netcore/feature/AB5822-smidge-implementation' into netcore/feature/ab5819-initialize-composers 2020-04-01 15:57:07 +02: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
3aa849fff2 AB#5819 - Moved composing of core/infrastructure items into CoreInitialComposer 2020-04-01 15:50:46 +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
c75c86ab27 AB#5822 Clean up 2020-03-31 16:28:13 +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
Shannon
8535d0fbe3 Cleans up IIOHelper and removes methods/props that shouldn't exist, changes test helper to use WorkingDirectory fixes some usages of MapPath 2020-03-31 17:27:51 +11:00
Shannon Deminick
31bd20e54a Merge pull request #7669 from AndyButland/netcore/7668-remove-repository-concerns-from-services 
.NetCore: Remove direct database queries from services
 2020-03-31 14:39:15 +11:00
Bjarke Berg
ffc6ce6553 AB#8522 - Smidge implementation of the Runtime Minifier 2020-03-30 21:27:35 +02:00
Andy Butland
1760241607 Merge branch 'netcore/dev' into feature/7540-use-image-url-generator-back-office 2020-03-30 14:19:15 +02:00
Andy Butland
cdb65762f1 Merge branch 'netcore/dev' into netcore/7668-remove-repository-concerns-from-services 2020-03-30 14:17:16 +02:00
Shannon
7617027c49 Moves most of the UserRepositoryTest 2020-03-30 21:53:30 +11:00
Shannon
9ed925941f Gets DB installation test working with runtime level checking 2020-03-30 17:25:29 +11:00
Andy Butland
5a29365063 Revert change to overridden save method on key value repository. 2020-03-28 15:20:17 +01:00
Andy Butland
8958cf90b9 Moved non-scoped retrieval of key value into an extension method in IUmbracoDatabase. 2020-03-28 15:13:50 +01:00
Andy Butland
f01ccb49dd Removed key value service initialization logic. 2020-03-28 15:04:36 +01:00
Andy Butland
3e40389819 PR review amends on key value model and repository classes. 2020-03-28 15:04:11 +01:00
Andy Butland
bc05370995 Merge branch 'netcore/dev' into netcore/7668-remove-repository-concerns-from-services 2020-03-28 14:31:23 +01:00
Andy Butland
f48a4b0c72 Merge branch 'netcore/dev' into feature/7540-use-image-url-generator-back-office 2020-03-27 21:20:08 +01:00
Bjarke Berg
44e9df949d Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Infrastructure/Models/Property.cs
#	src/Umbraco.Tests/Models/ContentTests.cs
 2020-03-26 19:22:09 +01:00
Andy Butland
30567d34d5 Merge branch 'netcore/dev' into feature/7540-use-image-url-generator-back-office 
# Conflicts:
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
 2020-03-26 10:53:24 +01:00
Shannon
f24cae51d8 Renames IHostingEnvironmentLifetime to IApplicationShutdownRegistry 2020-03-26 15:39:20 +11:00
Shannon
a0acc8126d oops change namespace back to Umbraco.net 2020-03-25 16:52:42 +11:00
Shannon
612a47b16b Splits interfaces into separate ones, removes overlap between interfaces, injects the necessary bits, and much more 2020-03-25 15:06:22 +11:00
Shannon
900505704c Committing a namespaces change 2020-03-25 14:54:45 +11:00