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

34836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjarke Berg
e3c8bd8ced Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Cache/MemberCacheRefresher.cs
#	src/Umbraco.Infrastructure/Compose/NotificationsComponent.cs
#	src/Umbraco.Infrastructure/Search/ExamineComponent.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Web/Security/MembershipHelper.cs
#	src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
 2020-09-23 12:54:13 +02:00
Sebastiaan Janssen
95a46580d6 Merge branch 'v8/8.7' into v8/dev 2020-09-23 11:10:56 +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
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
Sebastiaan Janssen
c00017220a NuGet.org had TLS 1.0 and 1.1 disabled - https://devblogs.microsoft.com/nuget/deprecating-tls-1-0-and-1-1-on-nuget-org/. 
Therefore we need this line specifying Tls12

(cherry picked from commit c91281c4b8)
 2020-09-22 14:38:24 +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
Bjarke Berg
8e9889d269 Post merge 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-22 12:44:36 +02:00
Bjarke Berg
bd534d340e Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Infrastructure/Services/Implement/IIconService.cs
#	src/Umbraco.Infrastructure/Services/Implement/IconService.cs
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeModel.cs
#	src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
#	src/Umbraco.Web/Editors/IconController.cs
#	src/Umbraco.Web/Editors/PreviewController.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
 2020-09-22 12:38:36 +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
Claus
b12fad75da Merge remote-tracking branch 'origin/v8/8.8' into v8/dev 2020-09-22 10:38:25 +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
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
Warren Buckley
e7f98a5690 Merge pull request #8815 from umbraco/v8/bugfix/events-unsubscribe 
Ensure event handlers are unsubscribed  in Core Components
 2020-09-21 11:27:47 +01: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
Lars-Erik Aabech
deb03e4d82 Eliminates error/no-preview when grid media picker have no crop set (#8620) 2020-09-17 11:32:52 +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
Niels Swimberghe
312dc1d9a7 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.
 2020-09-17 12:25:09 +10:00
Bjarke Berg
c9243d9d61 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-09-15 09:35:05 +02:00
Warren Buckley
2e055ca146 Merge pull request #7599 from umbraco/v8/feature/ui-media-create-button-style 
UI: corrected button style to match new style
 2020-09-14 12:02:26 +01:00
Niels Lyngsø
4a8703d5a3 no message 2020-09-14 11:56:50 +02: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
Bjarke Berg
d14e2a99bc Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	.gitignore
#	build/NuSpecs/tools/Web.config.install.xdt
#	src/Umbraco.Core/ContentExtensions.cs
#	src/Umbraco.Infrastructure/Intall/InstallHelper.cs
#	src/Umbraco.Infrastructure/Models/Blocks/BlockEditorModel.cs
#	src/Umbraco.Infrastructure/Models/Blocks/BlockItemData.cs
#	src/Umbraco.Infrastructure/Models/Blocks/BlockListLayoutReference.cs
#	src/Umbraco.Infrastructure/Models/Mapping/CommonMapper.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockListConfigurationEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Tests/PropertyEditors/BlockListPropertyValueConverterTests.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web/Compose/NestedContentPropertyComponent.cs
 2020-09-09 14:16:46 +02: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
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
Ronald Barendse
5faa9ae22f 8.7RC Add generic BlockListItem classes (#8841) 2020-09-08 12:08:27 +02:00
Claus
f20920167a Merge pull request #8844 from umbraco/v8/bugfix/remove-blocklistextensions 
V8.7RC: Removing extensions for GetBlockListHtml on IPublishedContent
 2020-09-08 10:46:06 +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