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

177 Commits

Author SHA1 Message Date
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
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
6e5dfbf8da fixed issue with formatting, by changing order of attributes 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-07 15:03:31 +02:00
Bjarke Berg
34979566ea Merge remote-tracking branch 'origin/netcore/feature/contentcontroller_and_related' into netcore/feature/remaining-backoffice-controllers 2020-07-07 14:02:25 +02:00
Bjarke Berg
7a3f658ccc Dispose StreamReaders 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-07 14:00:47 +02:00
Bjarke Berg
f3614d51fa Merge remote-tracking branch 'origin/netcore/feature/contentcontroller_and_related' into netcore/feature/remaining-backoffice-controllers 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Filters/UmbracoAuthorizeFilter.cs
 2020-07-07 13:17:08 +02:00
Bjarke Berg
8400b53f70 Cleanup based on review 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-06 12:55:23 +02:00
Bjarke Berg
ce4c6f7965 Do not use camelcase as default in AngularJsonMediaTypeFormatter 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-29 14:36:23 +02:00
Bjarke Berg
0676e9d35f Added unittest of IgnoreRequiredAttributesResolver 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-29 12:35:08 +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
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
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
e181c94cf4 Added async version of GetRawBodyString 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-26 08:20:36 +02:00
Bjarke Berg
e14a81c72d Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 2020-06-25 11:47:12 +02:00
Bjarke Berg
ba38055ee9 Merge branch 'netcore/dev' into bug/use-sql-main-dom-lock-when-linux 2020-06-25 11:39:11 +02:00
Bjarke Berg
0714fc4734 Migrated some of the UserControllerTests 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-22 14:11:01 +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
73123704cd Added JsonDateTimeFormatAttribute 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-18 19:40:13 +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
a6b23fbfa0 Entity controller migrated 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-15 13:07:49 +02:00
Andy Butland
1cf4374a48 Updated various type filters to attributes with nested filters. 2020-06-13 11:08:59 +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
c2b2b5010d Review + build fix 2020-06-11 13:04:01 +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
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
45dcf62878 remove unused code 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-10 13:58:25 +02:00
Bjarke Berg
6d701f17c3 remove unused code 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-10 13:57:28 +02:00
Bjarke Berg
c726054e5d Fix csproj 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-10 13:49:30 +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
9b991f3882 Fixes back office check, adds more tests, changes area to be a constant 2020-06-09 13:01:05 +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
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
Bjarke Berg
b5f0a7348d Avoid using Current.IOHelper 2020-06-08 08:51:50 +02:00
Andy Butland
458de2b0be Migrated tree related classes to .NET core 2020-06-07 09:34:32 +02:00
Bjarke Berg
8694498583 Fix for model in templates 2020-06-05 13:31:08 +02:00
Bjarke Berg
1d543d1dfd Migrated MacroRenderingController + Related UmbracoComponentRenderer => TemplateRenderer + ParitalViewMacroEngine 2020-06-05 06:31:42 +02:00