yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,453 Commits 4 Branches 7 Tags
dc8933b6b975ecff18ff1a6718b627e2f53ae1fc
Commit Graph

317 Commits

Author SHA1 Message Date
Bjarke Berg
e74570c0ac More clean up of old configs 2020-09-14 14:12:38 +02:00
Bjarke Berg
e079bd5a50 Cleanup usages of Configs 2020-09-08 13:03:43 +02:00
Andy Butland
8241643183 Resolved various failing tests. 2020-08-25 12:30:43 +02:00
Andy Butland
2f22313ceb Restored Umbraco.Web and added temporary methods for converstion between legacy and new configuration models to maintain build. 2020-08-23 15:58:37 +02:00
Andy Butland
89b725ef28 Reverted non netcore related project amends in order to limit changes to those necessary for the netcore executable call stack. 2020-08-23 14:05:35 +02:00
Andy Butland
510bd92e78 Amended injection of further settings to use IOptionsSnapshot. 2020-08-21 14:52:47 +01:00
Bjarke Berg
adb38dceb5 Merge remote-tracking branch 'origin/netcore/feature/contentcontroller_and_related' into netcore/feature/remaining-backoffice-controllers 2020-06-28 14:00:26 +02:00
Bjarke Berg
9d639a64b3 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Core/Templates/IUmbracoComponentRenderer.cs
#	src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
 2020-06-28 13:35:25 +02:00
Bjarke Berg
2ffb01530a Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Core/Models/PublishedContent/IndexedArrayItem.cs
#	src/Umbraco.Infrastructure/Models/Mapping/CommonMapper.cs
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web/Compose/AuditEventsComponent.cs
#	src/Umbraco.Web/HtmlHelperRenderExtensions.cs
#	src/Umbraco.Web/HtmlStringUtilities.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
 2020-06-28 12:48:19 +02:00
Bjarke Berg
1594a84d80 migated remaining backoffice controllers 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-22 10:08:08 +02:00
patrickdemooij9
591575b47d Added content apps for document types (#8187) 
* Added content apps for document types

* PR Feedback updates

* Updated the javascript code to use Utilities

* Replace tolowercase comparison with localeCompare
 2020-06-19 18:10:16 +01:00
Bjarke Berg
f86d8185bf Clean up and based on review comments 2020-06-11 11:21:07 +02:00
Bjarke Berg
57b8ab201d Clean up and fixed second ctor in PhysicalFileSystem 2020-06-11 11:07:21 +02:00
Bjarke Berg
1d543d1dfd Migrated MacroRenderingController + Related UmbracoComponentRenderer => TemplateRenderer + ParitalViewMacroEngine 2020-06-05 06:31:42 +02:00
Bjarke Berg
58c70c3a90 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/en_us.xml
 2020-05-29 13:02:27 +02:00
Bjarke Berg
dca04b3dd7 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
#	src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs
#	src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
#	src/Umbraco.Web/Models/Trees/MenuItemList.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/Trees/RelationTypeTreeController.cs
#	src/Umbraco.Web/UmbracoApplication.cs
 2020-05-29 12:59:42 +02:00
Bjarke Berg
71a8cb6d35 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Migrated DataTypeController + Fixed injection of services to UmbracoApplicationAuthorizeAttribute 2020-05-26 14:42:19 +02:00
Marc Goodson
b6262bf334 Remove ContentFinderByRedirectUrl if RedirectUrlTracking is disabled (#7761) 2020-05-25 17:51:52 +02:00
Shannon
e3591923c3 Gets auto-routing back office api controllers working, lots of notes 2020-05-14 17:04:16 +10:00
Bjarke Berg
bc4713a51c #6233- SqlCE stuff 2020-04-28 07:02:14 +02:00
Bjarke Berg
f79526e46a Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB6233-install-steps-in-dotnet-core 
# Conflicts:
#	src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
#	src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
 2020-04-24 08:23:55 +02:00
Bjarke Berg
79e9235338 AB#6233 - Install in .NET Core 2020-04-22 08:17:45 +02:00
Shannon
18b285f088 Splits profiler so it doesn't have to take a dependency since we don't want to pre-resolve. Adds enrichers to the container. 2020-04-22 15:23:51 +10:00
Shannon
d56867757c Merge branch 'netcore/dev' into netcore/feature/ab5819-initialize-composers 2020-04-08 15:59:00 +10:00
Shannon
f19e18e160 Removes new namespaces: Umbraco.Core.Cookie, Umbraco.Core.Session, Umbraco.Core.Request, these are web things and should be part of one namespace 2020-04-08 15:56:19 +10:00
Bjarke Berg
7c87ec3141 Merge remote-tracking branch 'origin/netcore/feature/AB5822-smidge-implementation' into netcore/feature/ab5819-initialize-composers 2020-04-03 10:12:10 +02:00
Shannon
7e2d0902af Huge IIOHelper cleanup, removes some overlap with IHostingEnvironment, much less usages of IIOHelper and instead just use what is already available on IHostingEnvironment 2020-04-03 11:03:06 +11:00
Shannon
95a36b3064 Changes namesspace, fixes cdf registrations, fixes bundle registrations, cleanup 2020-04-02 21:19:42 +11:00
Bjarke Berg
97cf099f9f AB#5819 - Moved composing of core/infrastructure items into CoreInitialComposer 2020-04-01 20:00:27 +02:00
Bjarke Berg
3aa849fff2 AB#5819 - Moved composing of core/infrastructure items into CoreInitialComposer 2020-04-01 15:50:46 +02:00
Bjarke Berg
55426515c0 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5822-smidge-implementation 
# Conflicts:
#	src/Umbraco.Infrastructure/Media/ImageProcessorImageUrlGenerator.cs
#	src/Umbraco.Infrastructure/Models/ImageProcessorImageUrlGenerator.cs
#	src/Umbraco.Infrastructure/Models/ImageSharpImageUrlGenerator.cs
#	src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs
#	src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
#	src/Umbraco.Web.UI.NetCore/appsettings.json
 2020-03-31 15:36:25 +02:00
Bjarke Berg
ffc6ce6553 AB#8522 - Smidge implementation of the Runtime Minifier 2020-03-30 21:27:35 +02:00
Bjarke Berg
219391246d Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5822-smidge-implementation 2020-03-30 07:23:44 +02: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
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
Bjarke Berg
629be33357 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5822-smidge-implementation 
# Conflicts:
#	src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
#	src/Umbraco.Web/Editors/PackageInstallController.cs
#	src/Umbraco.Web/UrlHelperExtensions.cs
 2020-03-26 06:53:05 +01:00
Shannon
a0acc8126d oops change namespace back to Umbraco.net 2020-03-25 16:52:42 +11:00
Shannon
900505704c Committing a namespaces change 2020-03-25 14:54:45 +11: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
Elitsa Marinovska
5293a3c1b5 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5490-abstract-clientdependency 2020-03-23 12:50:16 +01: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
b93b4f7c4f Changed CharCollection input to not special case : 2020-03-19 18:43:39 +01:00
Bjarke Berg
f84798322c AB3671 - Moved WebRuntime into infrastracutre, and removed typefinder reference in AppCaches (Replaced with string input with Type).. 
- Move initialized of Current.Factory out of webruntime
 2020-03-19 08:53:18 +01:00
Bjarke Berg
00418959f2 Extracted IConfigManipulator from IConnectionStrings, and implemented a XML (legacy) and JSON version. 2020-03-18 19:17:51 +01:00
Bjarke Berg
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
Elitsa Marinovska
ae4b9c3f42 Moving CDF related files into its own folder 2020-03-17 15:35:18 +01:00
Elitsa Marinovska
0eb194cd66 Removing dependency registration from WebInitialComposer as it is done in ClientDependencyComposer 2020-03-17 14:53:40 +01:00
Bjarke Berg
b2d529dea6 Merge branch 'netcore/feature/simplify-config' into netcore/feature/aspnetcore-config 2020-03-17 14:10:06 +01:00