Commit Graph

31644 Commits

Author SHA1 Message Date
Bjarke Berg
caa8ccd306 AB3869 - Removed UmbracoVersion from Core Current 2019-11-20 11:36:17 +01:00
Bjarke Berg
259c0263bd Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB3869-move-packages
# Conflicts:
#	src/Umbraco.Core/Composing/CompositionExtensions/Services.cs
#	src/Umbraco.Core/Packaging/PackagesRepository.cs
#	src/Umbraco.Tests/TestHelpers/TestObjects.cs
2019-11-20 11:32:57 +01:00
Bjarke Berg
44e2019e72 Merge pull request #7190 from crgrieve/7173-crl
Injecting umbraco version
2019-11-20 11:26:36 +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
8ff37564f1 AB3869 - Moved IPackagingService 2019-11-19 13:45:21 +01:00
Bjarke Berg
81b0175cc5 Merge branch 'netcore/dev' into netcore/feature/AB3869-move-packages 2019-11-19 13:42:18 +01:00
Bjarke Berg
00ce1f389a Simple moved files from core to abstractions 2019-11-19 13:40:38 +01:00
Bjarke Berg
2dad288b93 AB3869 included missing file 2019-11-19 13:10:37 +01:00
Bjarke Berg
133c6b121a AB3869 move packages to abstractions 2019-11-19 13:03:58 +01:00
Bjarke Berg
2c9a1d9735 AB3869 move packages to abstractions 2019-11-19 13:01:00 +01:00
Bjarke Berg
9ab6c5fe7b Injecting RuntimeState instead of using Current 2019-11-19 11:44:34 +01:00
Bjarke Berg
b14c01e33d Merge branch 'netcore/dev' into netcore/feature/AB3789-move-propertyeditors 2019-11-19 11:06:13 +01:00
Bjarke Berg
a49b313080 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2019-11-19 11:05:32 +01:00
Bjarke Berg
7376331761 AB3789 - Moved some of the propertyEditor stuff 2019-11-19 11:00:03 +01:00
Bjarke Berg
cd0de24a11 Merge branch 'netcore/dev' into netcore/feature/AB3789-move-propertyeditors 2019-11-19 10:48:37 +01:00
Bjarke Berg
638f05f0b2 Merge remote-tracking branch 'origin/v8/dev' into netcore/feature/AB3789-move-propertyeditors 2019-11-19 10:46:27 +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
Bjarke Berg
0484a85f56 Merge remote-tracking branch 'origin/v8/dev' into netcore/feature/AB3789-move-propertyeditors 2019-11-19 10:43:46 +01:00
Bjarke Berg
45b6fcd404 AB3789 - Moved some of the propertyEditor stuff 2019-11-19 10:37:48 +01:00
Bjarke Berg
5c0f9fb438 Merge pull request #7175 from umbraco/netcore/feature/AB3743-move-remaining-udi-stuff-and-deploy
Netcore: Move remaining Udi stuff
2019-11-19 10:25:37 +01: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
f6ff67aef4 Merge pull request #7170 from soreng/netcore/feature/remove_current_iohelper
Netcore/feature/remove current iohelper
2019-11-19 09:28:25 +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 Deminick
f10a3809ec Merge pull request #7169 from umbraco/netcore/feature/move_icontent_type
NetCore: Move IContentType to abstractions
2019-11-19 17:01:39 +11: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 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
Claus
5a78c28d19 Merge pull request #7171 from umbraco/v8/bugfix/fix-unclosed-xml-in-italian-language
Close unclosed key element in italian language file
2019-11-18 22:29:39 +01: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