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

137 Commits

Author SHA1 Message Date
Shannon Deminick
2aae974281 Merge pull request #8394 from umbraco/netcore/feature/fix-integration-tests 
Netcore: More tests migrated..
 2020-08-11 11:54:37 +10:00
Shannon
cfc4933170 Merge branch 'netcore/netcore' into netcore/feature/fix-integration-tests 2020-08-10 15:50:05 +10:00
Bjarke Berg
499ffdfe97 Merge pull request #8584 from umbraco/netcore/feature/request-localization-from-user 
Netcore: Added request localization from the current user.
 2020-08-10 07:04:20 +02:00
Bjarke Berg
379454cd4b fix appsettings.json 2020-08-07 14:36:45 +02:00
Bjarke Berg
c57c42d2ec Fixes merge conflicts 2020-08-07 14:00:56 +02:00
Bjarke Berg
23a6de30ec Merge pull request #8458 from umbraco/netcore/feature/AB7479-macro-templates-migration 
NetCore: Migrating Macro Templates
 2020-08-04 15:05:25 +02:00
Bjarke Berg
38ee3c322d Moved needed extension methods for the Gallery snippet.. 2020-08-04 14:12:22 +02:00
Bjarke Berg
1dac8779c2 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/7619 - Added request localization from the current user 2020-08-04 12:54:54 +02:00
Bjarke Berg
c672f61c53 Revert appsettings.json 2020-08-04 08:14:30 +02:00
Shannon
4edf7fdf83 Ensure all back office controllers are plugin controllers and use constant 2020-08-04 12:27:21 +10:00
Bjarke Berg
6dd896ea01 https://github.com/umbraco/Umbraco-CMS/pull/8458 cleanup 2020-08-03 14:28:23 +02:00
Elitsa Marinovska
717d8e6156 Migrating as many of the templates from Umbraco.Web.UI\Umbraco\PartialViewMacros\Templates 2020-07-21 08:12:29 +02:00
Bjarke Berg
add44c4139 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/fix-integration-tests 2020-07-10 13:50:44 +02:00
Bjarke Berg
3daad871ce Merge pull request #8396 from umbraco/netcore/feature/AB4827-sqlce-nuget 
NuGet package specifications for SQL CE
 2020-07-10 13:49:42 +02:00
Bjarke Berg
e0ae0551f8 Moved back invalid templates to legacy UI project 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-10 13:10:56 +02:00
Bjarke Berg
1c38b25cfb fix for csproj file 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-10 13:04:24 +02:00
Bjarke Berg
b4bc1f79b5 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB4822-nuget-packages-basis 2020-07-10 13:03:35 +02:00
Elitsa Marinovska
498f01fa10 Removing duplicated folder reference 
which causes the proj to not load in Visual Studio
 2020-07-10 11:24:50 +02:00
Bjarke Berg
1625cb323d Moved lang-folder 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-10 06:44:56 +02:00
Bjarke Berg
66a549c89b Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB4822-nuget-packages-basis 2020-07-09 18:03:15 +02:00
Bjarke Berg
1dcacda036 Moved umbraco cshtml files into the umbraco folder 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-08 11:18:23 +02:00
Elitsa Marinovska
6282ac4a5b Merged changes from base branch 2020-07-08 09:07:54 +02:00
Bjarke Berg
6bb33c865f Small fixes to build.ps1 and added xml doc generation to projects 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-07 20:40:44 +02:00
Bjarke Berg
7b546e6cee Attempts to fix issue 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-30 20:11:39 +02:00
Bjarke Berg
cbb0d5cb6b Added SQLCe refernece to the netcore project 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-29 14:38:15 +02:00
Bjarke Berg
b9f854afcb Boot netcore on https:localhost:44331 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-29 12:13:53 +02: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
0b2230922f revert aspsettings.json 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-22 14:11:34 +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
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