Commit Graph

31602 Commits

Author SHA1 Message Date
Shannon
0137996815 Fixes tests, adds notes 2019-11-19 15:38:06 +11:00
Shannon
dbd76a903a Cleans up the IPropertyType interface, cleans up how it is constructed 2019-11-19 15:25:04 +11:00
Shannon
1ef5106529 oops fix build 2019-11-19 14:54:03 +11:00
Shannon
645cfcab42 Simplifies the interface inheritance removes SimpleContentTypeMapper (can't be used), improves how mappers are looked up, simplifies other models 2019-11-19 14:10:08 +11:00
Shannon
9f5479d686 Cleans up interface inheritance a bit 2019-11-19 12:28:41 +11:00
Shannon
ba35afa494 re, re, re-fixes the merge issues with this stupid csproj file, hopefully it now merges upwards properly. 2019-11-19 12:17:42 +11:00
Shannon
31f51516d2 removes old config transforms for v7 -> v8 no longer needed 2019-11-19 11:53:05 +11:00
Shannon
fe2a919573 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/move_icontent_type 2019-11-19 11:52:09 +11:00
Shannon Deminick
901e3d1845 Merge pull request #7095 from umbraco/netcore/feature/AB3594_move_exsiting_configuration_to_own_project
Netcore: Move configuration
2019-11-19 11:49:21 +11:00
Shannon
f71a54ec8f Adds some comments and fixme 2019-11-19 11:45:21 +11:00
Shannon
8f48df66d5 Refactors Configs and how it acquires a factory, re-internalizes Umbraco.Configuration classes 2019-11-19 11:16:07 +11:00
Bjarke Berg
2c18dbffeb Clean up 2019-11-18 15:29:04 +01:00
Bjarke Berg
03cb9c0104 Fixed tests 2019-11-18 15:17:18 +01:00
Bjarke Berg
21e9d09ff0 AB3594 - Fixed tests 2019-11-18 14:54:16 +01:00
Bjarke Berg
6af645db95 AB3594 - removed reference to core from configuration 2019-11-18 14:22:11 +01:00
Bjarke Berg
4c05af7b9d AB3594 - Post review fixes.. Also removed the Current class from abstractions, and injected the factory into config 2019-11-18 14:11:50 +01:00
Bjarke Berg
50e61e9227 More usage of IPropertyType, and moved more classes 2019-11-18 13:03:24 +01:00
Bjarke Berg
a888b2e4a5 Merge remote-tracking branch 'origin/netcore/dev' into netcore/dev 2019-11-18 11:04:01 +01:00
Shannon
4338a8f32d Merge branch 'netcore/dev' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project 2019-11-18 20:23:31 +11:00
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
c62088aa85 Moved IMember, IPublicAccessService 2019-11-18 09:27:06 +01:00
Bjarke Berg
36e030a2af Moved IContentService, IDataType and PublishResult 2019-11-18 09:21:47 +01:00
Bjarke Berg
ac2e8f63ef AB3594 - Post Merge fixes :S 2019-11-15 12:25:09 +01:00
Bjarke Berg
47a0326e9c Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project 2019-11-15 11:43:05 +01:00
Bjarke Berg
603ec0ccfb AB3594 - Moved the composition root out to UmbracoApplicationBase, and injecting the needed parts from there. Also remove usages of ConfigurationManager from Umbraco.Core 2019-11-15 11:41:13 +01: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
Bjarke Berg
126380dcee AB3594 - Removed references from core to configuration 2019-11-14 12:49:56 +01:00
Bjarke Berg
73167029f0 Merge remote-tracking branch 'origin/v8/dev' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project 2019-11-14 08:05:32 +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
b50ffb11bd post merge 2019-11-13 15:52:18 +01:00
Bjarke Berg
2e200779f9 Merge branch 'netcore/feature/abstract-systemdirectories' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project 2019-11-13 14:20:21 +01: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
5edac2a476 Merge branch 'netcore/feature/abstract-systemdirectories' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project
# Conflicts:
#	src/Umbraco.Abstractions/IO/IIOHelper.cs
#	src/Umbraco.Core/IO/IOHelper.cs
2019-11-13 13:26:44 +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
0be396c4fd Post merge fixes 2019-11-13 12:53:01 +01:00