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

33622 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ab4d830626 Merge pull request #8930 from umbraco/v8/bug/8919-cache-icons-used-in-login-screen 
Inject icons used in login screen to the runtime icon cache
 2020-09-22 10:33:56 +02:00
Bjarke Berg
1badb69481 #8919 - Clean up obsolete ctor 2020-09-22 10:14:34 +02:00
Bjarke Berg
164fa24ef3 #8919 - Fix issue with wrong casing of variable name 2020-09-22 10:04:55 +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
Shannon
e6e7917b0c fixes create button 2020-09-22 11:34:59 +10:00
Shannon
ac9dedf327 Ensure we don't swallow exceptions in angular when logging in, fixes a null ref in angular preventing login in authorize screen, fixes login screen to use an explicit ng-form instance. 2020-09-22 11:05:37 +10: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
bc6952d77c Ensures the user service returns the real error when the current user fails, ensures we add the standard header to all ajax requests so they can be detected 2020-09-18 14:55:33 +10:00
Niels Lyngsø
d3db24e705 Merge remote-tracking branch 'origin/v8/8.8' into v8/bug/8919-cache-icons-used-in-login-screen 2020-09-17 15:00:02 +02:00
Niels Lyngsø
e2957bb715 inject icons to iconHelper to avoid making requests to the icon controller 2020-09-17 14:59:49 +02:00
Niels Lyngsø
0506c8c555 defineIcon method 2020-09-17 14:59:12 +02:00
Sebastiaan Janssen
6b0539fefc Set version to RC 2020-09-17 12:19:07 +02:00
Lars-Erik Aabech
6d15a2fce3 Eliminates error/no-preview when grid media picker have no crop set (#8620) 
(cherry picked from commit deb03e4d82)
 2020-09-17 11:35:17 +02:00
Niels Swimberghe
6d2135edd5 Change wrong URL in KeepAlive XML Comments 
The XML comments for KeepAlive mention the URL for the KeepAlive.Ping action but incorrectly omits 'umbraco' from the path.
The change adds the 'umbraco' section to the path.

(cherry picked from commit 312dc1d9a7)
 2020-09-17 09:19:09 +02:00
Warren Buckley
5a37854dd5 Merge pull request #7599 from umbraco/v8/feature/ui-media-create-button-style 
UI: corrected button style to match new style
(cherry picked from commit 2e055ca146)
 2020-09-17 09:18:55 +02:00
Shannon
9c5ad79a1f bumps version 2020-09-17 16:16:08 +10: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
559a4b00ad Allows custom view for external login provider to manage it's own form, updates umbLogin component to allow 3rd party interaction 2020-09-16 18:45:14 +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
8b89c73873 Ensure the user's name is locked when deny local login 2020-09-15 00:23:55 +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
Bjarne Fyrstenborg
600ae926d4 Remove local function to create guid and use String.CreateGuid() extension function instead (#8886) 2020-09-13 22:21:30 +02: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
Shannon
3b23b85dd5 Adds more functionality to the external login table and services to store additional user data with the provider info and adds tests. 2020-09-11 00:02:57 +10:00
Bjarke Berg
96f8dd2103 Merge pull request #8622 from umbraco/v8/feature/AB7482-acceptance-tests-for-content 
Acceptance tests for Content
 2020-09-09 13:28:48 +02:00
Bjarke Berg
f58e1e8edb Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB7482-acceptance-tests-for-content 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
 2020-09-09 13:14:20 +02:00
Sebastiaan Janssen
1f44b94ef6 Merge branch 'v8/dev' into v8/contrib 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
#	src/Umbraco.Web.UI.Client/test/config/karma.conf.js
 2020-09-09 12:52:42 +02: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
Bjarke Berg
6e25885804 Simplified the drag and drop 2020-09-09 10:29:41 +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
b4b7bb438d updated version of testhelpers 2020-09-09 07:51:05 +02:00
Bjarke Berg
7641b8da54 Merge remote-tracking branch 'origin/v8/8.7' into v8/feature/AB7482-acceptance-tests-for-content 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
 2020-09-09 07:46:35 +02:00
Bjarke Berg
34c09ce12d Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB7482-acceptance-tests-for-content 2020-09-08 21:05:58 +02:00
Sebastiaan Janssen
ecff24089c Bump version to 8.7.0 2020-09-08 14:46:22 +02: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