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

9517 Commits

Author SHA1 Message Date
Bjarke Berg
023ec53a9a Dont try to load assemblies that is not used yet 2020-08-19 08:43:24 +02:00
Bjarke Berg
6371fdbf4d post merge 2020-08-17 11:43:04 +02:00
Bjarke Berg
5cc0f00074 Introduced WebPath.Combine 2020-08-13 10:13:23 +02:00
Bjarke Berg
3ec13b3190 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/better-linux-support 
# Conflicts:
#	build/NuSpecs/UmbracoCms.SqlCe.nuspec
 2020-08-12 13:25:24 +02:00
Bjarke Berg
9eee058211 Fix issue with buildscript and verify nuget 2020-08-11 20:31:04 +02:00
Bjarke Berg
1123b8bea5 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/better-linux-support 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
 2020-08-11 08:33:11 +02:00
Bjarke Berg
94e1056dd9 Merge pull request #8603 from umbraco/netcore/feature/6976-migrate-preview-middleware 
Migrates preview auth Middleware
 2020-08-11 08:24:57 +02:00
Bjarke Berg
a02b5e93a5 Merge pull request #8598 from umbraco/netcore/feature/6972-migrate-non-oauth-auth-controller 
Migrates remaining non-oauth AuthenticationController actions to netcore
 2020-08-11 07:30:23 +02:00
Bjarke Berg
6d51dc4afa Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/6976-migrate-preview-middleware 2020-08-10 14:30:25 +02:00
Bjarke Berg
499ffdfe97 Merge pull request #8584 from umbraco/netcore/feature/request-localization-from-user 
Netcore: Added request localization from the current user.
 2020-08-10 07:04:20 +02:00
Bjarke Berg
c57c42d2ec Fixes merge conflicts 2020-08-07 14:00:56 +02:00
Shannon
cca7303abd Migrates preview auth Middleware 
Migrates UriExtensionsTests to netcore, fixes preview controller bits, adds tests for preview path for back office route check, fixes virtual paths for views,
 2020-08-07 00:48:32 +10:00
Bjarke Berg
39162f0f6a Merge conflicts resolved 2020-08-06 12:59:21 +02:00
Shannon
b9a4a75656 Migrates remaining non-oauth AuthenticationController actions to netcore 2020-08-06 19:09:05 +10:00
Shannon Deminick
9cafeaf39e Merge pull request #8590 from umbraco/netcore/bugfix/get_rid_of_system_web 
Netcore: Get rid of System.Web in netcore and netstandard projects
 2020-08-06 14:42:54 +10:00
Shannon Deminick
2c6f290dc0 Ensure that we validate all properties for a block based on it's element type properties, not just the property values that are POSTed (#8589) 2020-08-05 11:03:02 +02:00
Bjarke Berg
3ea7945f24 Get rid of system web in netcore and netstandard libraries 2020-08-05 08:44:22 +02:00
Bjarke Berg
23a6de30ec Merge pull request #8458 from umbraco/netcore/feature/AB7479-macro-templates-migration 
NetCore: Migrating Macro Templates
 2020-08-04 15:05:25 +02:00
Bjarke Berg
38ee3c322d Moved needed extension methods for the Gallery snippet.. 2020-08-04 14:12:22 +02:00
Bjarke Berg
1dac8779c2 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/7619 - Added request localization from the current user 2020-08-04 12:54:54 +02:00
Shannon
99b012fc26 Fixes package service paths so that it's using content and web roots not just web 2020-08-04 14:51:12 +10:00
Shannon
c7d42d94d0 Changes c# model for block list editor to be much simpler. 2020-08-03 22:02:10 +10:00
Shannon
7d762e0455 Merge remote-tracking branch 'origin/v8/8.7' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
 2020-07-31 15:55:39 +10:00
Evan Moore
4460e8d369 Get missing crops from configuration 2020-07-27 09:38:40 +02:00
Shannon
e01f36514b fixes tests 2020-07-23 22:14:06 +10:00
Shannon
f7a831f054 Fixes some JS issues with new data format, streamlines the blockeditor data format serialization in c#, implements To/FromEditor methods 2020-07-23 16:03:35 +10:00
Shannon
a194d1db4a first phase of new data format done in c# 2020-07-21 15:50:11 +10:00
Shannon
bd5986aa00 Merge branch 'v8/feature/block-editor-list-validation' into v8/feature/block-list-data-structure-v3 2020-07-21 13:29:56 +10:00
Shannon
b4345217f4 Removes weird unused service 2020-07-21 13:29:19 +10:00
Shannon
8098264206 WIP 2020-07-21 13:28:19 +10:00
Shannon
c8c9cfa7f2 Merge branch 'v8/8.7' into v8/feature/block-editor-list-validation 2020-07-20 16:08:55 +10:00
Shannon
c8488b6683 Merge branch 'v8/8.6' into v8/8.7 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Runtime/SqlMainDomLock.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
 2020-07-20 16:08:07 +10:00
Shannon
639c7a40ee Merge branch 'v8/8.6' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Runtime/SqlMainDomLock.cs
#	src/Umbraco.Examine/IndexRebuilder.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
 2020-07-20 16:03:10 +10:00
Bjarke Berg
5f47e75231 Merge remote-tracking branch 'origin/netcore/feature/fix-integration-tests' into netcore/feature/better-linux-support 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-10 14:15:38 +02:00
Bjarke Berg
3daad871ce Merge pull request #8396 from umbraco/netcore/feature/AB4827-sqlce-nuget 
NuGet package specifications for SQL CE
 2020-07-10 13:49:42 +02:00
Bjarke Berg
d94ecfe65e Fixes for running using nuget package 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-10 13:00:54 +02:00
Bjarke Berg
66a549c89b Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB4822-nuget-packages-basis 2020-07-09 18:03:15 +02:00
Shannon
191060f930 Merge branch 'v8/8.6' into v8/bugfix/sqlmaindom-updates 2020-07-09 16:33:44 +10:00
Shannon
0196e55c19 Cherry picks fix #7994 for #5151 2020-07-09 16:33:01 +10:00
Shannon
15b903129e comments 2020-07-09 14:32:48 +10:00
Shannon
df61f30393 refactors scheduled publishing logic - splits into 2x scopes/2x trans, only take a write lock when necessary 2020-07-08 18:16:12 +10:00
Shannon
e1757178b9 Fixes our sql azure transient fault detection to be inline with current standards, adds a scope for the health check schedule tasks 2020-07-08 17:26:31 +10:00
Elitsa Marinovska
6282ac4a5b Merged changes from base branch 2020-07-08 09:07:54 +02:00
Shannon
384531ea68 removes comments and no need for private method 2020-07-08 15:59:35 +10:00
Shannon
b80dc8f34b readability 2020-07-08 15:07:12 +10:00
Shannon
7590161858 comments 2020-07-08 14:54:26 +10:00
Shannon
7819d1acf5 comments 2020-07-08 14:53:53 +10:00
Shannon
a947fa3121 comments 2020-07-08 14:51:35 +10:00
Shannon
651756d96a Ensure we don't shutdown MainDom if there is an error while listening, only shutdown if the appdomain is triggered to shutdown, else we'll keep listening/logging 2020-07-08 13:43:20 +10:00
Shannon
53db2df390 Fix for PerformScheduledPublishInternal, don't use yield returns within a using! this will not work and transactions/connections will be lost 2020-07-08 13:43:20 +10:00