Commit Graph

27731 Commits

Author SHA1 Message Date
Shannon
d35040e2eb couple more composer things 2019-11-22 00:32:33 +11:00
Shannon
79507c405d moving files 2019-11-22 00:25:26 +11:00
Bjarke Berg
d6ba60a2a4 Removed local include 2019-11-21 08:29:32 +01:00
Bjarke Berg
4d5d94d3ed 7173 - Refactored to inject IUmbracoVersion instead of using Current. 2019-11-20 10:50:15 +01:00
Carole Rennie Logan
100d4431dc removing unused using statements 2019-11-19 23:24:08 +00:00
Carole Rennie Logan
b69d14da5e IUmbracoVersion updates 2019-11-19 23:15:11 +00:00
Carole Rennie Logan
015d588218 First comimt changing IUmbracoVersion 2019-11-19 22:37:14 +00:00
Bjarke Berg
97ade695a7 Move more code without lot of changes 2019-11-19 14:12:11 +01:00
Bjarke Berg
00ce1f389a Simple moved files from core to abstractions 2019-11-19 13:40:38 +01:00
Bjarke Berg
9ab6c5fe7b Injecting RuntimeState instead of using Current 2019-11-19 11:44:34 +01:00
Bjarke Berg
a49b313080 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2019-11-19 11:05:32 +01:00
Warren Buckley
8d3850a50b Merge pull request #7167 from umbraco/v8/bugfix/7147-fix-losing-content-when-using-embed-in-RTE
Embed function in RTE removes previous content from RTE
2019-11-19 09:44:44 +00:00
Warren Buckley
7c1af34b3e Update src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js 2019-11-19 08:58:00 +00:00
Bjarke Berg
d9d267a489 AB3743 - Moved more deploy stuff 2019-11-19 09:50:18 +01:00
Bjarke Berg
3ee18b8975 AB3743 - Moved the remaining Udi stuff and the required deploy stuff 2019-11-19 09:46:51 +01:00
Bjarke Berg
282973f1e2 More injections of IIOHelper 2019-11-19 08:52:39 +01:00
Bjarke Berg
ca77c519e9 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/remove_current_iohelper
# Conflicts:
#	src/Umbraco.Abstractions/Configuration/ConfigsExtensions.cs
#	src/Umbraco.Configuration/GlobalSettings.cs
#	src/Umbraco.Tests/Persistence/Repositories/ScriptRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/StylesheetRepositoryTest.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
#	src/Umbraco.Tests/TestHelpers/TestHelper.cs
2019-11-19 08:13:35 +01:00
Shannon
e45ea6560d fixes test, adds note 2019-11-19 17:00:58 +11:00
Shannon
e366f99105 Cleans up IPropertyType since we don't need the method ConvertAssignedValue as an abstraction 2019-11-19 15:52:56 +11:00
Shannon
e537a55181 fix incorrect validation 2019-11-19 15:42:18 +11:00
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
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
mikkelhm
6faa5d79d3 Close unclosed key element in italian language file 2019-11-18 22:17:39 +01:00
Søren Gregersen
be7c1f6eb1 fixed (almost all) tests 2019-11-18 20:43:38 +01:00
Søren Gregersen
0bdf0ec122 merged 2019-11-18 19:51:42 +01:00
Søren Gregersen
b99f2ca25f merged 2019-11-18 19:46:32 +01:00
Søren Gregersen
c1ecfbefd5 fix: reverted a few placed, passing tests 2019-11-18 17:40:15 +01: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
Niels Lyngsø
5c160f6390 Only replace content by EmbedItem if the selected content is of type EmbedItem. 2019-11-18 14:20:44 +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