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

107 Commits

Author SHA1 Message Date
Bjarke Berg
f86d8185bf Clean up and based on review comments 2020-06-11 11:21:07 +02:00
Bjarke Berg
96fee753b4 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/macros 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Web.BackOffice/Extensions/UmbracoBackOfficeServiceCollectionExtensions.cs
 2020-06-10 12:17:37 +02:00
Bjarke Berg
01433ee190 Removed views from csproj file 2020-06-08 09:02:27 +02:00
Bjarke Berg
39ace69879 Added runtime compilation of views 2020-06-05 12:50:26 +02:00
Bjarke Berg
1d543d1dfd Migrated MacroRenderingController + Related UmbracoComponentRenderer => TemplateRenderer + ParitalViewMacroEngine 2020-06-05 06:31:42 +02:00
Shannon
7ac01fc02f Merge branch 'netcore/netcore' into netcore/feature/websecurity 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Filters/OnlyLocalRequestsAttribute.cs
 2020-06-03 13:26:40 +10:00
Shannon Deminick
a7a463c7d4 Merge pull request #8183 from umbraco/netcore/feature/identity 
Back office identity changes and cookie authentication
 2020-06-03 12:55:57 +10:00
Shannon
b75fba71f5 Cleaning up websecurity and implementing it, migrates security stamp and session id validation for cookie auth 2020-06-02 13:28:30 +10:00
Shannon
793bbbab5b Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/identity-temp 2020-06-01 15:51:56 +10: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
Shannon
9904dc6cc2 Merge commit '6dcaa986cda8c8bbca06df8030299d5901d31ceb' into netcore/feature/identity-temp 2020-05-28 17:29:35 +10:00
Shannon
1cfc490751 More signinmanager, signin now works and we set the user principal in the correct place on login 2020-05-27 18:27:49 +10:00
Shannon
ef02571c8d changes port number/non ssl 2020-05-27 10:27:41 +10: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
Shannon
6a4c277fdc gets anti-forgery working (needs more testing) 2020-05-26 22:21:22 +10:00
Shannon
7f47540341 ensure bg image is set in config so it shows up 2020-05-26 18:21:00 +10:00
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
Elitsa Marinovska
16d805e6f5 Adding Smtp section in appsettings, registering IEmailSender as an email service and ofc the MailKit nuget in Infrastructure proj 2020-05-20 00:24:55 +02: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