Sebastiaan Janssen
|
b5546d074a
|
Merge branch 'v8/contrib' into v8/dev
|
2020-11-23 10:19:14 +01:00 |
|
Shannon
|
c2d9f5aa4e
|
Ensure that TaskScheduler.Default is used anywhere that ContinueWith is used, adds more debug logging to MainDom operations
|
2020-11-18 12:33:13 +11:00 |
|
Sebastiaan Janssen
|
f88144ae48
|
Merge branch 'v8/dev' into v8/contrib
# Conflicts:
# src/Umbraco.Examine/ContentIndexPopulator.cs
|
2020-11-04 11:34:27 +01:00 |
|
Sebastiaan Janssen
|
e42b8b20f4
|
Merge branch 'v8/8.9' into v8/dev
# Conflicts:
# src/SolutionInfo.cs
|
2020-11-04 11:30:27 +01:00 |
|
Sebastiaan Janssen
|
aac35698a1
|
Merge branch 'v8/8.8' into v8/8.9
|
2020-11-04 10:07:04 +01:00 |
|
Sebastiaan Janssen
|
bff6ded89d
|
Merge branch 'v8/8.7' into v8/8.8
|
2020-11-04 09:27:02 +01:00 |
|
Sebastiaan Janssen
|
d4fa37d6fb
|
Merge branch 'v8/8.6' into v8/8.7
|
2020-11-04 09:25:33 +01:00 |
|
Bjarke Berg
|
9cda7d1b5a
|
Fix for https://github.com/umbraco/Umbraco-CMS/pull/9146 - We need to take language and segment into account
(cherry picked from commit 223b19cbd8)
|
2020-11-03 10:22:15 +01:00 |
|
Bjarke Berg
|
223b19cbd8
|
Fix for https://github.com/umbraco/Umbraco-CMS/pull/9146 - We need to take language and segment into account
|
2020-11-03 10:20:46 +01:00 |
|
Nik
|
9a0746da84
|
Issue #8568 Add an override for GetMostRecentRedirectUrl to allow for culture being passed in (#9191)
|
2020-10-27 10:48:16 +00:00 |
|
Sebastiaan Janssen
|
b63944b9ef
|
Revert "Adds icons from App_Plugins/**/Icons/*.svg (#8884)"
This reverts commit d7bf980f12.
|
2020-10-25 09:59:44 +01:00 |
|
Sebastiaan Janssen
|
297671b631
|
Merge branch 'v8/8.8' into v8/dev
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Packaging/PackageDataInstallation.cs
|
2020-10-22 14:21:25 +02:00 |
|
Sebastiaan Janssen
|
befa23190b
|
Merge branch 'v8/8.6' into v8/dev
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
|
2020-10-22 14:18:21 +02:00 |
|
Sebastiaan Janssen
|
b69e65ab3b
|
Merge branch 'v8/8.7' into v8/8.8
# Conflicts:
# src/SolutionInfo.cs
|
2020-10-22 14:15:10 +02:00 |
|
Sebastiaan Janssen
|
2aefe899e4
|
Merge branch 'v8/8.6' into v8/8.7
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
|
2020-10-22 14:08:05 +02:00 |
|
Sebastiaan Janssen
|
094897704c
|
Need null checks for Keys in case packages had been created without keys before
|
2020-10-22 10:56:49 +02:00 |
|
Warren Buckley
|
f1724a68b2
|
When exporting package.xml it will now use the UDI/Key so we can reimport with the same key
(cherry picked from commit 28954afcad)
|
2020-10-21 21:04:16 +02:00 |
|
Warren Buckley
|
28954afcad
|
When exporting package.xml it will now use the UDI/Key so we can reimport with the same key
|
2020-10-21 21:03:31 +02:00 |
|
Shannon Deminick
|
657f1fcdc7
|
Fixes regression issue with property values being updated in content repositories (#9146)
|
2020-10-21 20:30:35 +02:00 |
|
Warren Buckley
|
d6b1cda176
|
Merge pull request #9046 from umbraco/v8/feature/confirm-website-preview-mode
UX: Auto exit PreviewMode, If Preview Mode is active user should Confirm to stay.
|
2020-10-21 14:09:05 +01:00 |
|
Warren Buckley
|
b49cb02935
|
Update src/Umbraco.Core/Constants-Web.cs
|
2020-10-21 13:02:31 +01:00 |
|
Sebastiaan Janssen
|
e1e7a1777e
|
Merge branch 'v8/8.8' into v8/8.9
|
2020-10-13 16:49:17 +02:00 |
|
Ronald Barendse
|
469e35190d
|
Retarget migration to Umbraco 8.9.0
(cherry picked from commit eb2f338406)
|
2020-10-13 16:35:51 +02:00 |
|
Ronald Barendse
|
eb2f338406
|
Retarget migration to Umbraco 8.9.0
|
2020-10-13 16:34:50 +02:00 |
|
Niels Lyngsø
|
dc072293f9
|
New dialogs for asking about Preview mode
|
2020-10-08 16:36:25 +02:00 |
|
Søren Kottal
|
d7bf980f12
|
Adds icons from App_Plugins/**/Icons/*.svg (#8884)
(cherry picked from commit 3b551bdc5d)
|
2020-10-06 15:09:56 +02:00 |
|
Søren Kottal
|
3b551bdc5d
|
Adds icons from App_Plugins/**/Icons/*.svg (#8884)
|
2020-10-06 15:06:03 +02:00 |
|
Sebastiaan Janssen
|
e9627f2ee9
|
Merge branch 'v8/dev' into v8/contrib
|
2020-10-05 21:12:51 +02:00 |
|
Ronald Barendse
|
2bfef74191
|
Fix casing of 'URL' (#9080)
|
2020-10-05 20:48:38 +02: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
|
0531fce9e2
|
Move the IIconService and IconModel to the Umbraco.Core project
See issue #8919
|
2020-09-23 16:20:55 +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 |
|
Sebastiaan Janssen
|
d6275f34f7
|
Merge branch 'v8/8.6' into v8/dev
# Conflicts:
# src/Umbraco.Web/Security/MembershipHelper.cs
|
2020-09-23 11:09:40 +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
|
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 |
|
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
|
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
|
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
|
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 |
|
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
|
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 |
|
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 |
|
Shannon
|
a2c24bcc76
|
Gets copying logic working for the block editor, needs more tests though
|
2020-09-08 02:07:02 +10:00 |
|
Shannon
|
1ab77adc8a
|
Ensure event handlers are unsubscribed in Core Components
|
2020-09-04 13:25:56 +10: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 |
|