yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,649 Commits 4 Branches 7 Tags
978d245f00b7d7bfb0a56dc232ad774fc41bb8ff
Commit Graph

10612 Commits

Author SHA1 Message Date
Claus
978d245f00 Merge remote-tracking branch 'origin/v8/8.8' into v8/8.9 2020-10-01 12:37:56 +02:00
Claus
94d4fef088 Merge remote-tracking branch 'origin/v8/8.6' into v8/8.8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web/Logging/WebProfilerComponent.cs
 2020-10-01 08:55:28 +02:00
Shannon
5ed94065a7 Fixes issue with exceptions in logs because we are trying to unbind from httpapplication events but you cannot do that. 2020-09-24 18:45:26 +10:00
Shannon
0e44acc45e Merge remote-tracking branch 'origin/v8/8.8' into v8/8.9 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
 2020-09-24 14:19:58 +10:00
Sebastiaan Janssen
fe3f604122 Move the IIconService and IconModel to the Umbraco.Core project 
See issue #8919

(cherry picked from commit 0531fce9e2)
 2020-09-23 16:21:34 +02:00
Sebastiaan Janssen
75830e1d3e Merge branch 'v8/8.7' into v8/8.8 
# Conflicts:
#	src/Umbraco.Web/Security/MembershipHelper.cs
 2020-09-23 11:24:32 +02:00
Shannon
7fc4364b52 Fixes issue with deleting external logins, fixes issue with saving new user logins when creating a new user, fixes issue of not checking if the linked login is already linked. 2020-09-23 15:45:58 +10:00
Claus
a2cb264f27 Merge remote-tracking branch 'origin/v8/bugfix/8433-member-login-sql-locks' into v8/8.6 
(cherry picked from commit 6122bffa24)
 2020-09-22 14:49:28 +02:00
Claus
041d0469b6 Merge remote-tracking branch 'origin/v8/bugfix/examine-reindex' into v8/8.6 
(cherry picked from commit 8fddb52f9a)
 2020-09-22 14:44:29 +02:00
Claus
6122bffa24 Merge remote-tracking branch 'origin/v8/bugfix/8433-member-login-sql-locks' into v8/8.6 2020-09-22 13:14:03 +02:00
Claus
8fddb52f9a Merge remote-tracking branch 'origin/v8/bugfix/examine-reindex' into v8/8.6 2020-09-22 11:42:44 +02:00
Bjarke Berg
1badb69481 #8919 - Clean up obsolete ctor 2020-09-22 10:14:34 +02:00
Bjarke Berg
5df3e051d3 Merge remote-tracking branch 'origin/v8/bug/8919-cache-icons-used-in-login-screen' into v8/bug/8919-cache-icons-used-in-login-screen 
# Conflicts:
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeModel.cs
#	src/Umbraco.Web/Editors/IconController.cs
#	src/Umbraco.Web/Services/IIconService.cs
#	src/Umbraco.Web/Services/IconService.cs
 2020-09-22 09:21:45 +02:00
Bjarke Berg
ccc0e82579 #8919 - Avoid having fat controller and do not new up a controller in a model 2020-09-22 08:58:16 +02:00
Claus
6e56b16342 adding IconService 2020-09-22 08:57:48 +02:00
Claus
b327399cd2 adding icon svg data from IconController. 2020-09-22 08:11:58 +02:00
Warren Buckley
3950f3286e Merge pull request #8815 from umbraco/v8/bugfix/events-unsubscribe 
Ensure event handlers are unsubscribed  in Core Components

(cherry picked from commit e7f98a5690)
 2020-09-21 15:23:02 +02:00
Shannon
75dc416ed9 Merge remote-tracking branch 'origin/v8/8.8' into v8/feature/no-local-login 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
#	src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html
#	src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
 2020-09-17 15:38:04 +10:00
Shannon
bc3f27d550 Ensures the OnAutoLinking event fires when the user exists, adds try/catches around the event so the event can bubble up errors to the UI 2020-09-16 12:36:39 +10:00
Shannon
be00934425 reverts the umb-button change 2020-09-14 22:53:26 +10:00
Shannon
003d52bd87 Makes ChallengeResult public, adds more functionality to umb-button 2020-09-14 18:03:23 +10:00
Shannon
26d8126497 More tests fixes up a few things with external login service, adds notes changes column to ntext 2020-09-11 14:37:31 +10:00
Shannon
dd6e51aab5 Changes how the custom view works, it now entirely replaces umbraco's default behavior including what is rendered in the back office, this is for max flexibility 2020-09-11 01:20:54 +10:00
Sebastiaan Janssen
0662284f29 Merge branch 'v8/8.7' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
 2020-09-09 12:48:28 +02:00
Shannon
2d50245a7d remove notes 2020-09-09 18:11:38 +10:00
Shannon
d00fb23e9a automatically flow any added claims in OnExternalLogin to the ticket (with notes) 2020-09-09 18:11:10 +10:00
Shannon
c7c7d9efcd Updates the invite flow, we will always create a local user because we must do that due to the user groups being pre-determined. 2020-09-09 18:09:16 +10:00
Bjarke Berg
bef8cb9589 Added old ctor to avoid a breaking change 2020-09-08 14:32:09 +02:00
Warren Buckley
c3d69df27b Merge pull request #8842 from umbraco/v8/bugfix/block-list-copying 
Ensure new UDIs for blocks when copying
 2020-09-08 11:19:18 +01:00
Ronald Barendse
ddc922a583 8.7RC Add generic BlockListItem classes (#8841) 
(cherry picked from commit 5faa9ae22f)
 2020-09-08 12:11:14 +02:00
Claus
bb30b17fe2 removing duplicated extension methods that could encourage bad practice when used in the wrong way. 
(cherry picked from commit 11e42c0a56)
 2020-09-08 10:37:35 +02:00
Claus
11e42c0a56 removing duplicated extension methods that could encourage bad practice when used in the wrong way. 2020-09-08 10:36:35 +02:00
Claus
3d385cc1db Merge pull request #8767 from umbraco/v8/bugfix/return-IHtmlString-from-GetBlockListHtml 
V8/bugfix/return IHtmlString from GetBlockListHtml

(cherry picked from commit 46b4b22dcd)
 2020-09-08 10:05:39 +02:00
Shannon
6e2576fb0d Ensure the component runs and don't replace UDIs on saving since its not necessary 2020-09-08 11:47:31 +10:00
Shannon
98bda6759e Adds more tests, cleans up tests 2020-09-08 11:25:37 +10:00
Shannon
56dd39bb1a cleanup 2020-09-08 02:09:05 +10:00
Shannon
a2c24bcc76 Gets copying logic working for the block editor, needs more tests though 2020-09-08 02:07:02 +10:00
Shannon
af53f27bc3 Fixes testing custom invite user flow and the AllowManualLinking setting for external providers 2020-09-07 18:46:38 +10:00
Claus
46b4b22dcd Merge pull request #8767 from umbraco/v8/bugfix/return-IHtmlString-from-GetBlockListHtml 
V8/bugfix/return IHtmlString from GetBlockListHtml
 2020-09-04 13:55:45 +02:00
Shannon
f2b8f355e1 Fixing up user invite event 2020-09-04 15:02:28 +10:00
Shannon
56a73d0395 More options for external providers with a toggle to not allow manual linking 2020-09-04 14:32:34 +10:00
Shannon
1ab77adc8a Ensure event handlers are unsubscribed in Core Components 2020-09-04 13:25:56 +10:00
Niels Lyngsø
1a35017d8f AC7976 dont place runtime vars in model (#8807) 2020-09-03 11:09:17 +02:00
Sebastiaan Janssen
10281cb0e6 Merge branch 'v8/dev' into v8/contrib 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
 2020-09-02 14:23:40 +02:00
Sebastiaan Janssen
79ac19bff8 Merge branch 'v8/8.7' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
#	src/Umbraco.Web.UI.Client/src/views/datatypes/delete.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
#	src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
#	src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/packages/edit.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
 2020-09-02 10:14:10 +02:00
Poornima Nayar
c1e2f8f974 RedirectToUmbracoPageResult - Extended to allow a Guid (#8139) 2020-08-31 22:06:04 +02:00
Shannon
6e08a0396e Umbraco to re-index data on background thread 
Fixes issue with scopes being disposed or referenced incorrectly due to yield returns as this can capture a scope in the enumerator which will get passed to a background thread in Examine and cause some issues. We saw this issue in netcore but the issue must still exist in v8 but we don't visibly see it for some reason. The other issue is that the ValueSet lookup for content was done 3x when an IContent is saved and it should only be done 2x, one for published, one for unpublished. The other issue is that the data lookups to build a ValueSet are intended to be done on a background thread. This is the case in v7 because the IEnumerable is lazy and passed all the way down to Examine's background thread but this doesn't occur in v8 because we need to iterate/split that value set before it's sent to Examine so the ValueSet is eagerly built within the request. We can easily resolve this by using the background task manager and just pushing a task when IContent/IMedia/IMember is saved. This will return the execution to the UI quicker.
 2020-08-31 23:41:19 +10:00
Shannon
3cac678bf3 WIP creating invite event 2020-08-31 22:53:17 +10:00
Nikolaj
10aae75ec6 Return IHtmlString instead of MvcHtmlString from GetBlockListHtml 2020-08-31 11:08:44 +02:00
Shannon
44cec326e9 need another build 2020-08-28 16:05:47 +10:00