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

90 Commits

Author SHA1 Message Date
Shannon
ab6a967a4e Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/identity 
# Conflicts:
#	src/Umbraco.Infrastructure/Composing/CompositionExtensions/CoreMappingProfiles.cs
 2020-05-26 17:37:07 +10:00
Bjarke Berg
2c2d70c500 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Moved controllers: HealthCheckController + All localization files + fixed issues with MapPath from wwwroot to content root 2020-05-25 14:50:51 +02:00
Bjarke Berg
ee3615e36d https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Moved controllers: TagsDataController, RteEmbedController, RichTextPreValueController, NestedContentController, WebProfilingController + Moved compose of MapDefinitionCollectionBuilder into core, and uncommented missing map definitions 2020-05-25 13:41:05 +02:00
Shannon
0730867d74 Gets default.cshtml rendering what should work, had to update quite a few things to get to this point, now need to figure out why it doesn't start booting angular. 2020-05-25 19:37:16 +10:00
Shannon
cf58782093 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/identity 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
 2020-05-21 15:46:43 +10:00
Bjarke Berg
4ca6868553 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6586 - Migrated TourController 2020-05-18 15:19:52 +02:00
Scott Brady
091712e5de Merge remote-tracking branch 'Umbraco/netcore/netcore' into netcore/feature/aspnetcoreidentity 2020-05-18 12:52:03 +01:00
Bjarke Berg
5e131ebafb Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.NetCore/Startup.cs
 2020-05-18 11:51:55 +02:00
Shannon
0973e49fcf removes test controller 2020-05-18 15:12:07 +10:00
Scott Brady
c6210ba7f2 Working installation. Use of Thread.CurrentPrincipal removed for now 2020-05-17 10:39:30 +01:00
Scott Brady
d12c6ddf62 Cleanup 2020-05-17 08:59:40 +01:00
Scott Brady
e872ba1a64 Resolvable user store 2020-05-15 16:52:51 +01:00
Scott Brady
c9f9706523 Initial DI attempt 2020-05-15 15:21:15 +01:00
Bjarke Berg
515d43e11b Merge branch 'netcore/netcore' into netcore/feature/auto-routing 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
 2020-05-15 14:10:03 +02:00
Andy Butland
8ae0e12512 Removed global setting of content model binder and used encoded URL in model binding exception filter redirect. 2020-05-15 10:33:09 +02:00
Shannon
e3591923c3 Gets auto-routing back office api controllers working, lots of notes 2020-05-14 17:04:16 +10:00
Shannon
4d6df1405f Moves routing into IAreaRoutes, ensures back office is redirected if installed 2020-05-13 14:49:00 +10:00
Bjarke Berg
cd48adc7af AB6455 - Stub'ed WebSecurity, cleanup and fix issue with content root vs web root 2020-05-12 20:28:40 +02:00
Elitsa Marinovska
6ddb103782 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB6455-migrate-surfacecontroller 2020-05-12 13:43:22 +02:00
Shannon
54769e2416 doh fix build 2020-05-12 17:25:30 +10:00
Shannon
42c347dc21 doh fix build 2020-05-12 17:19:19 +10:00
Shannon
f427059d41 Fixes routing for installer to use an area, fixes URL generation 2020-05-12 17:10:02 +10:00
Elitsa Marinovska
cbf7f5ccc3 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB6455-migrate-surfacecontroller 2020-05-12 08:29:39 +02:00
Shannon
bcaede22f1 Cleans up ext methods and where they are located and what they call to ensure dependencies are taken care of, cleans up Startup, moves routing appropriately 2020-05-12 15:18:55 +10:00
Shannon
39fed867c1 Cleans up some routing, mvc base classes, gets controller specific model binding working, applies our own application model to our controllers 2020-05-12 10:21:40 +10:00
Elitsa Marinovska
412067e11f Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB6455-migrate-surfacecontroller 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/Startup.cs
 2020-05-11 16:50:36 +02:00
Elitsa Marinovska
d33aa6cdf5 Updating the way we get UmbracoContext in RedirectToUmbracoPageResult.cs; removing the flushing in JsonNetResult.cs and adding necessary configuration for allowing sync operations needed in JsonNetResult.cs 2020-05-11 16:23:33 +02:00
Andy Butland
22b7484217 Implemented content model binder in netcore. 2020-05-08 13:23:44 +02:00
Shannon
12bb68100a Remove ununsed and unneeded DbProviderFactory CreateFactory(); from IDbProviderFactoryCreator, ensure the app doesn't explode if exceptions are thrown and boot fails 2020-05-08 17:30:30 +10:00
Shannon
d899e050fe resolves types from the assembly that was loaded, removes unused references, adds notes 2020-05-08 16:35:37 +10:00
Bjarke Berg
6a078ee09e AB#6233 - reorderen routing 2020-05-07 15:24:46 +02:00
Bjarke Berg
e3f9b94fd0 AB#6233 - Added HttpPost to ensure only posts are possible 2020-05-07 10:13:54 +02:00
Bjarke Berg
e4dfdbb504 AB#6233 - renamed extensions namespace to Umbraco.Extensions 2020-05-07 10:08:23 +02:00
Bjarke Berg
8f7c022f2d AB#6233 - Handle ApplicationUrl 2020-05-07 09:34:16 +02:00
Bjarke Berg
269c75e26b AB¤6233 - Reverted changes to typefinder and implemented check for if SqlCE is available in the install process 2020-05-06 20:37:03 +02:00
Bjarke Berg
13197eb5ff AB#6233 - Cleanup / Fixes from review 2020-05-05 14:28:01 +02:00
Bjarke Berg
305ed42b48 Moved the sqlce db to root/App_Data/umbraco.sdf, instead of wwwroot/App_Data/umbraco.sdf 2020-05-04 14:40:11 +02:00
Bjarke Berg
f3d81702ac AB#6233 - revert connectionstring 2020-05-01 13:47:44 +02:00
Bjarke Berg
b70d7101e3 AB#6233 - Explicit restarts umbraco after install to ensure runtime state is run and umbraco is correct composed. 2020-05-01 13:40:26 +02:00
Bjarke Berg
da1e83c0d1 AB#6233 - Added application url on IHostingEnvironment. Still need a way to figure out how to get this value 2020-05-01 08:26:05 +02:00
Bjarke Berg
59501eba86 AB#6233 - Cleanup 2020-04-29 16:11:56 +02:00
Bjarke Berg
64dfa009f5 #6233 - version in config removed 2020-04-28 12:31:15 +02:00
Bjarke Berg
bc4713a51c #6233- SqlCE stuff 2020-04-28 07:02:14 +02:00
Bjarke Berg
55d9af2b68 #6233- Install steps + MacroRenderer 2020-04-27 13:00:55 +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
f76e638f0d Merge remote-tracking branch 'origin/netcore/dev' into netcore/bugfix/logging-fixing 
# Conflicts:
#	src/Umbraco.Tests.Integration/RuntimeTests.cs
#	src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
#	src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
 2020-04-22 10:54:54 +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
2ef8f26b28 removes unneeded extra HostBuilderExtensions 2020-04-22 14:29:01 +10:00
Shannon
46e14f7692 Fixes up all logging. Configures serilog logging to replace MS logging just like serilog does, adds new ILoggerConfiguration so we aren't hard coding things, dynamically adds enrichers when the container is ready to resolve services. 2020-04-22 14:23:56 +10:00