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

33148 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Butland
93fd2eb954 Fixed creation of image processing options in grid media controller. 2020-03-28 14:11:24 +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
a72ae2278d Post merge + bugfix 2020-03-26 19:52:40 +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
Bjarke Berg
8964ef1c48 Register missing interface 2020-03-26 19:14:02 +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
d40b7087f4 Fixes issue with deep cloning Property 
main problem was that it was duplicating the _pvalue value when it shouldn't have. The real fix is that the Values property solves all these problems with it's setter but that wasn't being used by the DeepClone engine because that explicitly looks for certain collection types and IReadOnlyCollection wasn't one of them. With that included and PropertyValue marked as IDeepCloneable, it all just works. I've added tests.
 2020-03-26 19:56:21 +11:00
Bjarke Berg
6858739086 Fix for old references in new test project 2020-03-26 06:54:21 +01:00
Shannon Deminick
99c6ca7c7b Merge pull request #7840 from umbraco/netcore/feature/booting-netcore-db 
Netcore - Runtime booting and shutting down (and more)
 2020-03-26 15:40:18 +11:00
Shannon
f24cae51d8 Renames IHostingEnvironmentLifetime to IApplicationShutdownRegistry 2020-03-26 15:39:20 +11:00
Shannon Deminick
29293bd25a Update src/Umbraco.Tests.Integration/Implementations/TestHelper.cs 
Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
 2020-03-26 15:32:39 +11:00
Shannon Deminick
9bb9997288 Update src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs 
Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
 2020-03-26 15:31:27 +11:00
Shannon Deminick
fee1f6f0ab Update src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs 
Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
 2020-03-26 15:30:25 +11:00
Shannon Deminick
8b531b7aea Merge pull request #7820 from umbraco/netcore/feature/unit-test-project 
NetCore: Introduces a seperate UnitTest project
 2020-03-26 15:24:19 +11:00
Shannon
a5d728cc51 Reduce the usage of BuildServiceProvider 2020-03-25 18:21:44 +11:00
Shannon
1a8f422dce another note 2020-03-25 17:40:52 +11:00
Shannon
926b0662e7 another note 2020-03-25 17:39:36 +11:00
Shannon
77ce21b0e3 Adds notes/test about pre building the netcore container 2020-03-25 17:35:43 +11:00
Shannon
2d506c1fd0 Adds container test showing how we can pre-resolve a service and ensures its the same on that gets used. 2020-03-25 17:23:31 +11:00
Shannon
07966b5225 more unused code 2020-03-25 17:19:12 +11:00
Shannon
c988004762 fixes test 2020-03-25 17:18:36 +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
Sebastiaan Janssen
df04ffa68d Merge branch 'v7/dev' into v8/dev 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Core/packages.config
#	src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
#	src/Umbraco.Web.UI/packages.config
#	src/Umbraco.Web/packages.config
#	src/umbraco.cms/packages.config
#	src/umbraco.cms/umbraco.cms.csproj
#	src/umbraco.controls/packages.config
#	src/umbraco.controls/umbraco.controls.csproj
#	src/umbraco.editorControls/packages.config
#	src/umbraco.editorControls/umbraco.editorControls.csproj
 2020-03-24 17:30:10 +01:00
Alexander Karlsson
e8d63d9a7a #7780 Show all filters that is more then 0 hits 2020-03-24 17:08:01 +01:00
Andy Butland
519fd22cea Changed hard-coded processed images URLs in back-office to use configured image URL generation. 2020-03-24 12:29:16 +01:00
Andy Butland
e66c92d032 Added controller method to ImagesController and client-side method to mediahelper to retrieve URL for processed image. 2020-03-24 12:19:04 +01:00
Andy Butland
c16965319a Amended processed image URL building to use checks for empty as well as null, and refactored null checks to use HasValue. 2020-03-24 12:17:41 +01:00
Andy Butland
b67c3dfa04 Moved IImageUrlGenerator and implementation into more appropriate enamespace 2020-03-24 09:37:46 +01:00
Shannon
d0a204b984 Cleans up some unused code, fixes a merge issue causing duplicate runtimes to be created, register essential does what it's supposed to do, don't mix things with the webruntime. 2020-03-24 14:48:32 +11:00
Shannon
59f0edc074 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/booting-netcore-db 
# Conflicts:
#	src/Umbraco.Tests.Integration/RuntimeTests.cs
#	src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
 2020-03-24 14:47:10 +11:00
Shannon Deminick
bcc8dff862 Merge pull request #7811 from umbraco/netcore/feature/booting-netcore 
Puts in place the code to 'boot' Umbraco Core in netcore
 2020-03-24 12:12:24 +11:00
Shannon
2f8a85abe5 resolves remaining PR comments 2020-03-24 12:11:46 +11:00
Shannon
139cd3935f oops 2020-03-24 12:00:48 +11:00
Shannon
2bbdb699f2 reduces code duplication 2020-03-24 11:59:42 +11:00
Shannon
919d418920 Gets the DB installing in integration tests, changes integratino tests to use Generic Host builder 2020-03-24 11:53:56 +11:00
Bjarke Berg
8986783cbc Parse connection string provider 2020-03-23 14:31:21 +01:00
Bjarke Berg
a3930b1b70 Merge branch 'netcore/dev' into netcore/feature/unit-test-project 2020-03-23 13:56:18 +01:00
Bjarke Berg
919271b2c6 Post merge fix 2020-03-23 13:03:02 +01:00
Bjarke Berg
73a1058dd1 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Models/Property.cs
 2020-03-23 12:48:56 +01:00
Shannon
679b88a2fb more asserts 2020-03-23 17:35:04 +11:00
Shannon
5761381bc3 adds notes 2020-03-23 17:25:45 +11:00
Shannon
7900179abd oops fix build 2020-03-23 17:16:33 +11:00
Shannon
6013d856b7 Changes back TestHelperBase, we'll just allocate new configs each time. 2020-03-23 17:15:32 +11:00
Shannon
427c44468f Changes methods to properties since we don't return new instances each time. 2020-03-23 16:41:39 +11:00
Shannon
299e9eb209 fixing tests and merges 2020-03-23 16:39:27 +11:00
Shannon
1658fced23 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/booting-netcore 
# Conflicts:
#	src/Umbraco.Core/IO/IOHelper.cs
#	src/Umbraco.Infrastructure/Runtime/WebRuntime.cs
#	src/Umbraco.Tests.Common/TestHelperBase.cs
#	src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
#	src/Umbraco.Tests/Runtimes/StandaloneTests.cs
#	src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
#	src/Umbraco.Web.UI.NetCore/Program.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
#	src/Umbraco.Web/UmbracoApplication.cs
 2020-03-23 15:50:01 +11:00
Shannon Deminick
91ae2d63da Merge pull request #7822 from umbraco/netcore/feature/ab3671-webruntime-netstandard 
NetCore: Make WebRuntime netstandard compatible
 2020-03-23 15:09:02 +11:00
Bjarke Berg
4d7952b068 Clean up 2020-03-20 07:00:34 +01:00