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

31526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
cd3a97ce75 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Abstractions/Constants-Conventions.cs
 2019-11-18 19:58:42 +11:00
Bjarke Berg
a97e131891 Bump version o 8.6 (8.5 reserved for MB release) 2019-11-14 14:00:49 +01:00
Bjarke Berg
c0dc545c27 Fix for csproj 2019-11-14 13:54:04 +01:00
Bjarke Berg
7c72fb57f2 Merge remote-tracking branch 'origin/v8/8.3' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web/Cache/LanguageCacheRefresher.cs
 2019-11-14 13:40:32 +01:00
Bjarke Berg
ba73ad5792 Merge remote-tracking branch 'skttl/grid-editor-name-templates' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
#	src/Umbraco.Web.UI/config/grid.editors.config.js
 2019-11-14 13:08:05 +01:00
Shannon Deminick
0423ea7bd8 Merge pull request #7152 from umbraco/netcore/feature/AB3761-moving-stuff 
Moving whatever can be moved currently to Abstractions project
 2019-11-14 17:19:57 +11:00
Shannon
f4f440e9f8 Moves a couple more packaging things 2019-11-14 17:16:47 +11:00
Shannon
1db673d544 Moves some packages stuff 2019-11-14 17:10:06 +11:00
Shannon
1f17085801 Merge branch 'netcore/dev' into netcore/feature/AB3761-moving-stuff 2019-11-14 17:00:47 +11:00
Shannon
89f5cec832 Fixes System.ComponentModel.Annotations to keep working with aspnet framework 2019-11-14 17:00:21 +11:00
Shannon
221a0c8d9d Moves more stuff 2019-11-14 16:59:43 +11:00
Shannon
3bd223669f Moves as much as possible from Models/Packaging, Models/PublishedContent, Models/Entities, Models/Membership 2019-11-14 16:19:24 +11:00
Shannon Deminick
075937de59 Merge pull request #7145 from umbraco/v8/feature/0000-Remove-non-production-mode-from-gulp 
remove isProd from Gulp script
 2019-11-14 13:14:02 +11:00
Shannon
7cbb2840a4 Merge branch 'Jeavon-v8/feature/search-media-files' into v8/dev 2019-11-14 12:40:53 +11:00
Shannon Deminick
d0f534e2f4 Merge pull request #7120 from umbraco/netcore/feature/AB3649-move-manifest-stuff 
Netcore: Move manifest code
 2019-11-14 12:10:25 +11:00
Shannon Deminick
2012745c13 Merge pull request #7135 from umbraco/netcore/feature/abstract-systemdirectories 
Changed SystemDirectories from static to instance,
 2019-11-14 12:08:40 +11:00
Bjarke Berg
c9a99f52aa Can't have the path info on IOHelper, because that leads to a cycle between config and IOHelper. Now you need to go directly to config, if you need a path 2019-11-13 14:15:50 +01:00
Bjarke Berg
b721e75cd2 Move the config usage out of IOHelper 2019-11-13 13:22:28 +01:00
Jeavon
88f6ddeae4 Code tweaks from PR review - also led to adding logging for Deserialization issues and therefore needing to mock the logger for the tests 2019-11-13 12:07:11 +00:00
Bjarke Berg
e7683b7a39 Cleanup and moved some methods from the interface 2019-11-13 12:56:22 +01:00
Bjarke Berg
683c0da468 Moved stuff from SystemDirectories into constants and IOHelper to avoid a circular dependency 2019-11-13 11:56:32 +01:00
Niels Lyngsø
e2adb4964c remove isProd from Gulp script 2019-11-13 09:36:40 +01:00
Shannon Deminick
149d128d03 Merge pull request #7144 from umbraco/netcore/feature/AB3742-udi-fixing 
Fixing Udi and moving it's components to Abstractions
 2019-11-13 17:29:13 +11:00
Shannon
1a6a31e337 Moves more Udi things 2019-11-13 16:51:07 +11:00
Shannon
c97b156eaf Moves Udi, UriParser and others to abstractions 2019-11-13 16:44:40 +11:00
Shannon
c58c31c6bd Split Udi into UdiParser & UdiParserServiceConnectors, remove GuidUdi and StringUdi Parse methods (makes no sense), adds generic parse method to UdiParser, simplifies tests, removes Current usage 2019-11-13 16:33:40 +11:00
Shannon
995b31b86c Cleans up IProperty 2019-11-13 12:17:09 +11:00
Shannon
319376d157 Cleans up IPropertyCollection 2019-11-13 12:04:50 +11:00
Shannon
850ecf6900 Cleans up IPropertyType 2019-11-13 11:56:35 +11:00
Shannon
46b27d1257 Changes protected field to property, makes Regex/Required valiidators more resilient to testing removes the need for setting up Current in the ManifestParserTests 2019-11-13 11:43:16 +11:00
Shannon
5bcf9ef102 removes IOHelper registration 2019-11-13 11:17:48 +11:00
Shannon Deminick
89e9b14f88 Merge pull request #7131 from umbraco/v8/hotfix/7125-update-dependencies-to-same-as-nuspec 
V8: Update the projects to use the same dependencies as required by our nuspec
 2019-11-13 09:21:53 +11:00
Bjarke Berg
42904d63aa Fixed views 2019-11-12 15:32:03 +01:00
Bjarke Berg
0fcf8325e3 Changed SystemDirectories from static to instance, Added interface in abstractions and create a static property on current. 2019-11-12 15:25:21 +01:00
Bjarke Berg
9b4c26bf7e AB3649 - Fixed tests 2019-11-12 13:40:07 +01:00
Jeavon
10622cc430 Switched to using a dummy Uri so that runtimeState isn't needed as per review 2019-11-12 10:26:25 +00:00
Jeavon
b30f7b6a48 Merge branch 'v8/dev' into v8/feature/search-media-files 2019-11-12 10:12:03 +00:00
Bjarke Berg
c016a48b36 AB3649 - Extracted IManifestParser 2019-11-12 11:06:50 +01:00
Bjarke Berg
94f5894b74 AB3649 - Moved manifest stuff 2019-11-12 10:59:04 +01:00
Bjarke Berg
b64b0758e1 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB3649-move-manifest-stuff 2019-11-12 10:42:48 +01:00
Bjarke Berg
6da93c6fc3 AB3649 - Refactored services injected into ctor instead of methods 2019-11-12 10:42:39 +01:00
Bjarke Berg
b4880944be Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB3649-move-manifest-stuff 
# Conflicts:
#	src/Umbraco.Core/CompositionExtensions_Essentials.cs
 2019-11-12 10:38:33 +01:00
Bjarke Berg
282220ee39 Merge pull request #7109 from umbraco/netcore/feature/AB3650-TypeFinder-abstraction 
ITypeFinder abstraction
 2019-11-12 10:37:41 +01:00
Bjarke Berg
267a9af30f Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB3650-TypeFinder-abstraction 
# Conflicts:
#	src/Umbraco.Core/CompositionExtensions_Essentials.cs
#	src/Umbraco.Core/Runtime/CoreRuntime.cs
#	src/Umbraco.Tests/Runtimes/StandaloneTests.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
 2019-11-12 10:05:54 +01:00
Bjarke Berg
7eef6b4037 https://github.com/umbraco/Umbraco-CMS/issues/7125 - Updates the projects to use the same versions as required by our nuspec 2019-11-12 08:50:31 +01:00
Shannon Deminick
40894c8ed0 Merge pull request #7129 from umbraco/netcore/feature/AB3736-services-models 
Moving most repositories and service interfaces (excluding content based ones)
 2019-11-12 17:57:19 +11:00
Shannon
e0351bc837 fix test 2019-11-12 17:56:47 +11:00
Shannon
0b16d6dee1 fix build 2019-11-12 16:44:13 +11:00
Shannon
161367bb71 fix build 2019-11-12 16:42:53 +11:00
Shannon
2b2db8b8ef Moves most service interfaces, ensure IOHelper is registered 2019-11-12 16:31:08 +11:00