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

9393 Commits

Author SHA1 Message Date
Bjarke Berg
989c83b452 Merge remote-tracking branch 'origin/netcore/feature/migrate-remaining-trees' into netcore/feature/contentcontroller_and_related 2020-06-12 10:03:37 +02:00
Bjarke Berg
609c1ffc5b Migrated content controller + related 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-12 08:27:22 +02:00
Bjarke Berg
e8c0a08ea8 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-remaining-trees 2020-06-11 15:21:51 +02:00
Bjarke Berg
16038e4232 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/get-remaining-seconds 2020-06-11 13:48:20 +02:00
Bjarke Berg
27fee12230 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-remaining-trees 2020-06-11 12:40:17 +02: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
835b04273f Migrated remaining *TreeController's 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-10 19:22:25 +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
9f17049582 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/websecurity 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Web/Editors/AuthenticationController.cs
 2020-06-10 11:13:32 +02:00
Bjarke Berg
9aea7039d2 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/macros 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
#	src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
 2020-06-10 10:55:56 +02:00
Shannon
2b412f337c Fixes issue with growing cookie/identity (we don't want to use Actor), fixes GlobalSettings issue, ensures temp claims are not cloned 2020-06-09 17:40:35 +10:00
Shannon
9b991f3882 Fixes back office check, adds more tests, changes area to be a constant 2020-06-09 13:01:05 +10:00
Shannon
ed2aba49d6 fix build, adds tests 2020-06-09 12:35:31 +10:00
Shannon
433a7c8908 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/get-remaining-seconds 
# Conflicts:
#	src/Umbraco.Web/Editors/AuthenticationController.cs
 2020-06-09 10:41:57 +10:00
Andy Butland
458de2b0be Migrated tree related classes to .NET core 2020-06-07 09:34:32 +02:00
Bjarke Berg
1029f4fe0b Fix for filesystems. Now rooted at the content root and not the www root 2020-06-05 11:36:59 +02:00
Bjarke Berg
1d543d1dfd Migrated MacroRenderingController + Related UmbracoComponentRenderer => TemplateRenderer + ParitalViewMacroEngine 2020-06-05 06:31:42 +02:00
Shannon
d024443b23 Converts FromClaimsIdentity to a bool method 2020-06-03 15:00:39 +10: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
c6481bdabb Migrates another methods of authentication controller over along with calculating the ticket's remaining seconds 2020-06-03 12:47:40 +10:00
Shannon
670d62a2dc Gets cookie authentication actually working along with session validation 2020-06-02 17:48:08 +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
f92f34934f fix remaining tests 2020-06-01 16:40:04 +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
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
Shannon
0ed9d1bd91 renames to LegacyPasswordSecurity 2020-05-28 23:24:32 +10:00
Shannon
9904dc6cc2 Merge commit '6dcaa986cda8c8bbca06df8030299d5901d31ceb' into netcore/feature/identity-temp 2020-05-28 17:29:35 +10:00
Shannon
e47f81efdc Gettting password formats and hashing sorted, ensuring the password format on the user is used 2020-05-27 13:48:26 +10:00
Sebastiaan Janssen
78a7785256 Merge branch 'v8/contrib' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
 2020-05-26 16:27:09 +02: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
Sebastiaan Janssen
407655ffcc Merge branch 'v8/contrib' into pr/7814 2020-05-26 09:11:00 +02: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
d89337e3d5 Cleans up IdentityAuditEventArgs and handling of the current user since we cannot resolve it from the thread. 2020-05-21 16:33:24 +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
Shannon
f47ceb8bbe Implements more of identity and makes it more specific to the back office (less intrusive), starts adding cookie auth 2020-05-21 15:43:33 +10:00
Bjarke Berg
28c4f87236 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6586 - Migrated ImageUrlGeneratorController + Made usage some strings into the enums in the ImageUrlGenerationOptions 2020-05-20 17:39:07 +02:00
Bjarke Berg
aa63ce5ed9 Merge branch 'netcore/dev' into netcore/netcore 
# Conflicts:
#	src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
#	src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
#	src/Umbraco.Web.UI.NetCore/appsettings.json
#	src/Umbraco.Web/Editors/AuthenticationController.cs
#	src/Umbraco.Web/Editors/UsersController.cs
 2020-05-20 12:43:13 +02:00
Bjarke Berg
2b4dfbca9d #8142 - Small cleanup, and bugfix 2020-05-20 11:42:23 +02:00
Shannon
558bde8596 Migrates back office variables and a couple methods for the BackOfficeController 2020-05-20 16:43:06 +10:00
Shannon
9818b4a14b Moves what is possible for identity back office to Core, configures backoffice identity with IOptions and our password settings 2020-05-20 15:25:42 +10:00
Shannon
057aa9bc66 Move more models: template, macro, ObjectTypes 2020-05-20 12:10:17 +10:00
Shannon
8134a35fe0 Moves ContentType, MemberType, MediaType, etc... less casting, less internals 2020-05-20 11:59:41 +10:00
Shannon
d444dfd441 Moves ContentTypeBase, Member, ContentTypeComposition, etc... removes the casting 2020-05-20 11:33:10 +10:00
Shannon
9e8bfd039e Ensures the correct version of Microsoft.AspNet.Identity.Core is used consistently, moves Media 2020-05-20 11:01:45 +10:00
Shannon
82ebda256b Fixes merge issues with Umbraco.Web.UI and ensures we are using a consistent version of System.ComponentModel.Annotations 2020-05-20 10:59:09 +10:00