9bf2d650ec
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/unit-test-project
2020-03-18 07:03:03 +01:00
f671fea998
NetCore: Refactor config/setting to not use dependencies ( #7810 )
...
* Avoid usage of IOHelper in GlobalSettings
* Avoid usage of IOHelper in ModelsBuilderConfig.cs
* Avoid usage of IOHelper in ConnectionStrings.cs
* Simplified more config
* Fix for ModelsBuilderConfig
* Moved GetUmbracoMvcAreaNoCache to IOHelperExtensions
2020-03-17 16:26:56 +01:00
1457e98554
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
2020-03-17 14:11:39 +01:00
ead3de05e4
Added the correct sources to the buildscripts. If you have inte… ( #7089 )
2020-03-13 13:30:54 +01:00
4c134f9701
Revert "Fix the build for people on VS version 16.4.5+"
...
This has been properly fixed in Umbraco.Build 0.2.14 instead
This reverts commit f4861f6802
2020-03-13 09:47:05 +01:00
6fafe0408d
oops fixes build
2020-03-13 12:47:09 +11:00
94c9057119
Moves some stub test objects to the common test lib
2020-03-13 12:44:42 +11:00
32a27be206
fixing tests
2020-03-13 12:33:28 +11:00
54727ca0fd
Ensures package versions are all streamlined
2020-03-13 12:24:43 +11:00
4e4df96140
Creates new Umbraco.Tests.Common netstandard project to host the common testing functionality between netframework and netcore, this will be ongoing work (doesn't need to be done all at once)
2020-03-13 12:08:25 +11:00
7f8c7e472f
Merge pull request #7778 from umbraco/netcore/feature/typefinder-netstandard
...
Creates a netstandard compliant TypeFinder
2020-03-13 11:11:50 +11:00
f9d29b17e2
Merge pull request #7800 from umbraco/netcore/feature/cleanup-config
...
NetCore: Granulate the Config/Settings
2020-03-13 11:09:15 +11:00
f4861f6802
Fix the build for people on VS version 16.4.5+
2020-03-12 17:17:49 +01:00
5f13dde1cd
Moved functionality to write to the connection strings into the configuration area
2020-03-12 16:56:39 +01:00
c486444eda
Cleaned up config for Content settings
2020-03-12 15:30:22 +01:00
cb0994a929
Cleaned up config for Security settings
2020-03-12 14:36:25 +01:00
e27a05c3e8
Cleaned up config for RequestHandler settings
2020-03-12 12:46:08 +01:00
e2dfc68718
Cleaned up config for WebRouting settings
2020-03-12 09:52:34 +01:00
e4ff481053
Cleaned up config for Keep Alive settings
2020-03-12 08:28:31 +01:00
f446e52d8f
Cleaned up condig for Logging and Tours
2020-03-12 08:24:02 +01:00
84847267ba
updates CoreRuntime with notes and fallback
2020-03-12 15:26:06 +11:00
e07c9abd58
Updated js code in UI project
2020-03-11 12:54:33 +01:00
007fe8d894
7434 do not use umb outline for select ( #7788 )
2020-03-11 11:18:53 +01:00
da7552204d
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
...
# Conflicts:
# src/Umbraco.Web/Models/RegisterModel.cs
# src/Umbraco.Web/UmbracoHelper.cs
2020-03-11 07:44:17 +01:00
39026258ec
Merge pull request #7752 from umbraco/v8/feature/AB5435-make-umbracohelper-props-obsolete
...
Obsoleting UmbracoHelper properties
2020-03-11 07:40:46 +01:00
e3997a4ab2
adds notes
2020-03-11 15:32:26 +11:00
3bfa2e76cb
Adjust type finder and adds benchmark
2020-03-11 15:28:08 +11:00
66cd25d8f5
Adds notes
2020-03-11 13:10:34 +11:00
5ee2286436
Removes build manager type finder and friends
2020-03-11 12:43:46 +11:00
a695a6ad76
Merge branch 'v7/dev' into v8/dev
...
# Conflicts:
# apidocs/umbracotemplate/styles/main.css
# build/NuSpecs/UmbracoCms.Core.nuspec
# src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
# src/Umbraco.Core/Serialization/JsonNetSerializer.cs
# src/Umbraco.Tests/Resolvers/LazyManyObjectResolverTests.cs
# src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
# src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
# src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
# src/Umbraco.Web/Cache/MediaCacheRefresher.cs
# src/Umbraco.Web/Cache/UnpublishedPageCacheRefresher.cs
# src/Umbraco.Web/Editors/BackOfficeController.cs
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Profiling/WebProfiler.cs
# src/Umbraco.Web/Profiling/WebProfilerProvider.cs
# src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
# src/Umbraco.Web/PublishedContentExtensions.cs
# src/Umbraco.Web/Routing/ContentFinderByNiceUrlAndTemplate.cs
# src/Umbraco.Web/Search/ExamineEvents.cs
# src/Umbraco.Web/umbraco.presentation/content.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
2020-03-10 22:03:28 +01:00
7dc6ddf3a8
Merge branch 'v7/dev' into v7/7.15
2020-03-10 21:54:01 +01:00
d11a1946f5
V7: Don't call ClearPreviewXmlContent from ClearDocumentXmlCache ( #6631 )
2020-03-10 21:52:53 +01:00
959a6df634
Merge branch 'v7/dev' into v7/7.15
2020-03-10 21:51:00 +01:00
7ca6781d09
v7: Fix false matches for AltTemplate convention Urls ( #7150 )
2020-03-10 21:49:59 +01:00
cfdc4ce807
Merge branch 'v7/dev' into v7/7.15
...
# Conflicts:
# src/Umbraco.Core/Serialization/JsonNetSerializer.cs
# src/Umbraco.Web/Editors/BackOfficeController.cs
2020-03-10 21:38:33 +01:00
cf060e9789
Merge remote-tracking branch 'origin/v8/feature/AB5435-make-umbracohelper-props-obsolete' into v8/feature/AB5435-make-umbracohelper-props-obsolete
2020-03-10 10:37:13 +01:00
9be30f3e91
Added info to obsolete message
2020-03-10 10:36:34 +01:00
9d6762fb6a
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
...
# Conflicts:
# src/Umbraco.Core/Models/PropertyType.cs
# src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
# src/Umbraco.Infrastructure/Models/Mapping/EntityMapDefinition.cs
# src/Umbraco.Tests/Models/PropertyTypeTests.cs
2020-03-10 08:25:43 +01:00
d3ebdb6198
fixes test
2020-03-09 22:25:58 +11:00
be753754a4
Merge pull request #7740 from AndyButland/netcore/77007-replace-no-nodes
...
NetCore: Replaced nonodes.aspx with MVC controller and view, with configurable view location
2020-03-09 12:07:06 +01:00
8cb39ba583
Fixes tests and some issues discovered
2020-03-09 21:23:38 +11:00
bad1913e0e
update Umbraco.ModelsBuilder.Embedded attributes to match assembly name
2020-03-09 10:19:26 +01:00
46686ffd90
Corrected document outline
2020-03-09 08:51:00 +01:00
fce27fd42d
Ensures all assemblies at the same location as the entry point assemblies are queried.
2020-03-09 14:15:02 +11:00
d92fc8736a
More cleanup, cleans up tests, cleans up the BuildManagerAssemblyProvider (even though it's not used)
2020-03-09 13:31:56 +11:00
0c8426f308
Cleans up POC code (still more to do)
2020-03-09 13:14:16 +11:00
41c2d01078
initial POC code
2020-03-09 11:03:42 +11:00
8e3967c596
Merge branch 'netcore/dev' into netcore/77007-replace-no-nodes
...
# Conflicts:
# src/Umbraco.Core/Configuration/IGlobalSettings.cs
# src/Umbraco.Core/Constants-Web.cs
2020-03-06 07:28:13 +01:00
a0aad045fb
Merge pull request #7652 from benjaminhowarth1/patch-1
...
Update PropertyType.cs
2020-03-05 17:51:03 +11:00
fbe3925b54
Merge pull request #7705 from umbraco/netcore/feature/executable-backoffice
...
NetCore: Executable in .NET Core
2020-03-05 15:20:47 +11:00
Bjarke Berg