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

237 Commits

Author SHA1 Message Date
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
3d65cb96e1 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/contentcontroller_and_related 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
 2020-06-28 13:59:33 +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
6d993eb63b Cleanup 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-26 13:58:15 +02:00
Bjarke Berg
7ef840702f Merge remote-tracking branch 'origin/netcore/feature/contentcontroller_and_related' into netcore/feature/remaining-backoffice-controllers 2020-06-26 09:49:03 +02:00
Bjarke Berg
c369647f10 Made FromJsonPathAttribute public 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-26 08:20:50 +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
558c0b03ee Migrated MemberController 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-18 21:03:11 +02:00
Bjarke Berg
748d23bf6d Added MemberTypeController 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-18 19:50:42 +02:00
Bjarke Berg
73123704cd Added JsonDateTimeFormatAttribute 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-18 19:40:13 +02:00
Bjarke Berg
27227043ba Added custom (hack) for PrefixlessBodyModelValidatorAttribute. 2020-06-18 14:40:30 +02:00
Bjarke Berg
593acaeab9 Merge remote-tracking branch 'origin/netcore/feature/migrate-remaining-trees' into netcore/feature/migrate-remaining-trees 2020-06-17 18:06:03 +02:00
Bjarke Berg
fe7d4ed3e9 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-remaining-trees 2020-06-17 18:05:40 +02:00
Bjarke Berg
d5f2d8456a Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/contentcontroller_and_related 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeNotificationsController.cs
#	src/Umbraco.Web.BackOffice/Filters/ValidateAngularAntiForgeryTokenAttribute.cs
 2020-06-17 17:01:45 +02:00
Bjarke Berg
3a33e7bf29 Migrated ControllerContentTests.. Right now the test fails, but the test is correct 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-17 16:39:28 +02:00
Bjarke Berg
a5f5b1a984 Migrated unit tests for FilterAllowedOutgoingContentAttribute and MediaController 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-15 14:43:11 +02:00
Bjarke Berg
a6b23fbfa0 Entity controller migrated 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-15 13:07:49 +02:00
Bjarke Berg
cf7ed273d7 Fix import/export 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-15 08:52:03 +02:00
Andy Butland
1cf4374a48 Updated various type filters to attributes with nested filters. 2020-06-13 11:08:59 +02:00
Bjarke Berg
834a8173d0 Migrated Media controller + ContentTypeControllerBase + ContentTypeController, MediaTypeController 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-12 22:13:43 +02:00
Bjarke Berg
52bc003c8e Migrated more stuff for MediaController 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-12 15:58:53 +02:00
Bjarke Berg
a4a074e22c More content model binding 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-12 13:35:37 +02:00
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
f1257ef717 Inject specific IFileSystem into FilesTreeController 2020-06-11 15:38:12 +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
925324041c review fixes 2020-06-11 12:41:29 +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
6440abbda9 Updated BackOfficeServerVariables 2020-06-11 08:00:35 +02:00
Bjarke Berg
aa7637129c Fix tests by reintroducing some files in Umbraco.Web 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-10 19:23:56 +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
246e28d147 Implements PostLogout and ensures all appropriate cookies are cleared on logout along with ensuring that the ticket is renewed each user seconds request if configured to stay logged in. 2020-06-09 14:36:36 +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
Bjarke Berg
c35d2c0793 Migrated section controller + LanguageTreeController, ApplciationTreeController. 
Updated AngularJsonOnlyConfigurationAttribute to be a TypeFilterAttribute, to allow injeciton into the filter.

Fixed test
 2020-06-08 14:07:36 +02:00
Bjarke Berg
af382e5e71 Migrated section controller + LanguageTreeController, ApplciationTreeController. 
Updated AngularJsonOnlyConfigurationAttribute to be a TypeFilterAttribute, to allow injeciton into the filter.

Note: Left TODO about checking authorization of proxied trees..
 2020-06-08 13:14:23 +02:00
Andy Butland
458de2b0be Migrated tree related classes to .NET core 2020-06-07 09:34:32 +02:00
Bjarke Berg
39ace69879 Added runtime compilation of views 2020-06-05 12:50:26 +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
6a560d6340 Fixed tests 2020-06-05 06:36:42 +02:00
Bjarke Berg
1d543d1dfd Migrated MacroRenderingController + Related UmbracoComponentRenderer => TemplateRenderer + ParitalViewMacroEngine 2020-06-05 06:31:42 +02:00
Bjarke Berg
772041bb8f Migrated MacrosController.cs 2020-06-05 06:17:54 +02:00