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

34246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bjarke Berg
98e81614d0 Changed check from null only to IsNullOrEmpty to make it safer 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-26 08:21:17 +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
e181c94cf4 Added async version of GetRawBodyString 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-26 08:20:36 +02:00
Bjarke Berg
8a3d104f85 Using constants instead of hardcoded strings 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-26 08:20:19 +02:00
Bjarke Berg
1a05feac02 Clean up 2020-06-25 15:23:11 +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
76d568de12 Merge pull request #8134 from umbraco/bug/use-sql-main-dom-lock-when-linux 
Use sql main dom lock as default if linux
 2020-06-25 11:39:33 +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
f9d5acee84 Added test 2020-06-25 11:22:59 +02:00
Bjarke Berg
aaccaef6af Started on AutoMoqDataAttribute 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-24 22:00:27 +02:00
Shannon Deminick
ee7d62e583 Fixes #7148 - ensures we only check for SurfaceController routes (#8322) 
* See https://github.com/umbraco/Umbraco-CMS/issues/7148 for bug report and reason for fork and PR.

* Fixes #7148 - ensures we only check for SurfaceController routes

When finding the SurfaceController to post back to when using BeginUmbracoForm we weren't specifically checking for only SurfaceControllers routes since we just assumed it would be a SurfaceController route. This is problematic if using a SurfaceController simultaneously as an IRenderController with a custom front-end route since it will fail to find that controller to post back to. This is fixed by further filtering the controllers looked up to only include SurfaceControllers.

Co-authored-by: Colin Wiseman <sayhi@codeitwise.co.uk>
 2020-06-24 10:22:10 +02:00
Sebastiaan Janssen
fee6ef0fb0 Merge branch 'v8/contrib' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
 2020-06-24 09:05:22 +02:00
Kenn Jacobsen
90a9ce4c5d Fix a few localizatoin glitches in the listview "Order by" selector 2020-06-23 18:43:43 +02:00
Kenn Jacobsen
b28bb9bb94 Listview "Order by" should not contain removed properties 2020-06-23 18:38:41 +02:00
Kenn Jacobsen
fe12f35d79 Parse complex RTE styles rules correctly 2020-06-23 18:37:23 +02:00
Jan Skovgaard
d539fdf4f6 Add backdrop when menu items are opened (#8121) 2020-06-23 18:36:09 +02:00