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

30175 Commits

Author SHA1 Message Date
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
Bjarke Berg
d94ecfe65e Fixes for running using nuget package 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-10 13:00:54 +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
32893d6adb Fix wrong xml doc comment 2020-07-09 11:06:38 +02:00
Bjarke Berg
1f3d2b13d3 Cleanup test by reusing MockedContentTypes 2020-07-09 11:02:28 +02:00
Bjarke Berg
2fa13e010c Added xml doc to AutoMoqDataAttribute 2020-07-09 11:00:29 +02:00
Bjarke Berg
819c1ba7ae Format fix 2020-07-09 10:51:56 +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
0c4959fc99 Merge branch 'netcore/feature/AB4822-nuget-packages-basis' into netcore/feature/AB4827-sqlce-nuget 2020-07-08 09:14:28 +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
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
b1fc81b642 Merge fix 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-07 14:06:21 +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
2e74a986f3 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/contentcontroller_and_related 2020-07-07 13:15:08 +02:00
Bjarke Berg
84b3bc94b4 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 2020-07-07 13:13:51 +02:00
Bjarke Berg
1cca4b50aa Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-07-07 13:08:57 +02:00
Bjarke Berg
cc6c6c3d3e Added todo message to PrefixlessBodyModelValidatorAttribute 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-07 12:49:22 +02:00
Bjarke Berg
610bbee245 Added OverrideAuthorizationAttribute 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-07 12:39:24 +02:00
Bjarke Berg
7e90db5b30 Cleanup based on review 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-06 13:01:25 +02:00
Bjarke Berg
a9c043c537 Cleanup based on review 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-06 12:58:11 +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
Shannon
b078f856b9 Remove the usage of Parallel to run the populators 2020-07-02 13:44:33 +02:00
Bjarke Berg
402958c591 Updated Cypress to latest + Created tests for creating member and member group 2020-06-30 15:19:54 +02:00
Bjarke Berg
984e660bec Possible fix for test db issue 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-30 13:02:32 +02:00
Bjarke Berg
40470099e9 Possible fix for test db issue 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-30 11:22:44 +02:00
Bjarke Berg
081795c192 Possible fix for test db issue 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-30 10:22:01 +02:00
Bjarke Berg
70544c38ed Cleanup + Ensure temp folder exists when background jobs are started. 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-30 08:14:26 +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
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
aedac5a2b4 Added test to TemplateQueryController.GetContentTypes to ensure camelcase 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-29 14:22:58 +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
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
3195287d1c Moved some registrations from Web-Mappings to Core-Mappings 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-29 10:51:53 +02:00
Bjarke Berg
91885e6557 Migrated mapper tests 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-29 10:44:46 +02:00
Bjarke Berg
3522843a0d Fix acceptance tests 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-28 14:31:21 +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
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
2ffb01530a Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Core/Models/PublishedContent/IndexedArrayItem.cs
#	src/Umbraco.Infrastructure/Models/Mapping/CommonMapper.cs
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web/Compose/AuditEventsComponent.cs
#	src/Umbraco.Web/HtmlHelperRenderExtensions.cs
#	src/Umbraco.Web/HtmlStringUtilities.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
 2020-06-28 12:48:19 +02:00
Bjarke Berg
6d993eb63b Cleanup 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-26 13:58:15 +02:00
Bjarke Berg
16a2cd1b3f Merge remote-tracking branch 'origin/netcore/feature/remaining-backoffice-controllers' into netcore/feature/remaining-backoffice-controllers 2020-06-26 09:49:18 +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