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

403 Commits

Author SHA1 Message Date
Bjarke Berg
f286fdd855 Skip ExamineComposer if not on windows 2020-08-26 10:50:31 +02:00
Bjarke Berg
95523e2a93 Merge pull request #8677 from umbraco/netcore/bugfix/send-notifications-dont-use-stmp-info-from-config 
Netcore: Fixes issue with notifications that did not use the SMTP from config
 2020-08-24 14:14:22 +02:00
Shannon
d2f7c11e89 Fixes issue with scopes being disposed or referenced incorrectly 2020-08-21 00:02:35 +10:00
Bjarke Berg
6fb73502ed Fix issue with sending notifications, due to the StmpClient. Not we use the EmailSender that handles StmpClient correct 2020-08-20 14:46:22 +02:00
Bjarke Berg
f913aff5fb Using Enumerable.Empty<T> 2020-08-20 08:15:07 +02:00
Bjarke Berg
b288c99e56 Register noop examine implementations in core, to be replaced by examine dll. 2020-08-19 19:42:58 +02:00
Bjarke Berg
6371fdbf4d post merge 2020-08-17 11:43:04 +02:00
Bjarke Berg
7b95494e30 Merge pull request #8572 from umbraco/netcore/bugfix/6970-backoffice-controller 
Migrates remaining non-oauth actions on back office controller to netcore
 2020-08-17 08:29:59 +02:00
Bjarke Berg
5cc0f00074 Introduced WebPath.Combine 2020-08-13 10:13:23 +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
c57c42d2ec Fixes merge conflicts 2020-08-07 14:00:56 +02:00
Bjarke Berg
39162f0f6a Merge conflicts resolved 2020-08-06 12:59:21 +02:00
Bjarke Berg
3ea7945f24 Get rid of system web in netcore and netstandard libraries 2020-08-05 08:44:22 +02:00
Shannon
0507e20214 Fixes scope handling, else the transaction is rolled back and the keyvalue table is not updated 2020-08-04 15:20:54 +10: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
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
Bjarke Berg
4f605c71e8 Merge remote-tracking branch 'origin/netcore/feature/fix-integration-tests' into netcore/feature/better-linux-support 2020-07-09 11:09:05 +02:00
Bjarke Berg
32893d6adb Fix wrong xml doc comment 2020-07-09 11:06:38 +02:00
Elitsa Marinovska
6282ac4a5b Merged changes from base branch 2020-07-08 09:07:54 +02:00
Bjarke Berg
6bb33c865f Small fixes to build.ps1 and added xml doc generation to projects 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-07 20:40:44 +02:00
Bjarke Berg
351fa02df2 Merge remote-tracking branch 'origin/netcore/feature/fix-integration-tests' into netcore/feature/better-linux-support 2020-07-07 14:10:21 +02:00
Bjarke Berg
f3614d51fa Merge remote-tracking branch 'origin/netcore/feature/contentcontroller_and_related' into netcore/feature/remaining-backoffice-controllers 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Filters/UmbracoAuthorizeFilter.cs
 2020-07-07 13:17:08 +02:00
Bjarke Berg
2e74a986f3 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/contentcontroller_and_related 2020-07-07 13:15:08 +02:00
Bjarke Berg
84b3bc94b4 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 2020-07-07 13:13:51 +02:00
Bjarke Berg
1cca4b50aa Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-07-07 13:08:57 +02:00
Bjarke Berg
8400b53f70 Cleanup based on review 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-06 12:55:23 +02:00
Bjarke Berg
c49f50e6d4 Clean up 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-04 19:04:04 +02:00
Bjarke Berg
f85204eaa1 Fixed lot of small issues for linux 2020-07-04 15:07:07 +02:00
Bjarke Berg
70544c38ed Cleanup + Ensure temp folder exists when background jobs are started. 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-30 08:14:26 +02:00
Bjarke Berg
3195287d1c Moved some registrations from Web-Mappings to Core-Mappings 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-29 10:51:53 +02:00
Bjarke Berg
91885e6557 Migrated mapper tests 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-29 10:44:46 +02:00
Bjarke Berg
adb38dceb5 Merge remote-tracking branch 'origin/netcore/feature/contentcontroller_and_related' into netcore/feature/remaining-backoffice-controllers 2020-06-28 14:00:26 +02:00
Bjarke Berg
3d65cb96e1 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/contentcontroller_and_related 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
 2020-06-28 13:59:33 +02:00
Bjarke Berg
9d639a64b3 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Core/Templates/IUmbracoComponentRenderer.cs
#	src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
 2020-06-28 13:35:25 +02:00
Bjarke Berg
2ffb01530a Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Core/Models/PublishedContent/IndexedArrayItem.cs
#	src/Umbraco.Infrastructure/Models/Mapping/CommonMapper.cs
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web/Compose/AuditEventsComponent.cs
#	src/Umbraco.Web/HtmlHelperRenderExtensions.cs
#	src/Umbraco.Web/HtmlStringUtilities.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
 2020-06-28 12:48:19 +02:00
Bjarke Berg
16a2cd1b3f Merge remote-tracking branch 'origin/netcore/feature/remaining-backoffice-controllers' into netcore/feature/remaining-backoffice-controllers 2020-06-26 09:49:18 +02:00
Bjarke Berg
7ef840702f Merge remote-tracking branch 'origin/netcore/feature/contentcontroller_and_related' into netcore/feature/remaining-backoffice-controllers 2020-06-26 09:49:03 +02:00
Bjarke Berg
98e81614d0 Changed check from null only to IsNullOrEmpty to make it safer 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-26 08:21:17 +02:00
Bjarke Berg
1a05feac02 Clean up 2020-06-25 15:23:11 +02:00
Bjarke Berg
1594a84d80 migated remaining backoffice controllers 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-22 10:08:08 +02:00
Bjarke Berg
ae51ea9486 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/contentcontroller_and_related 2020-06-18 14:43:26 +02:00
Bjarke Berg
833ff5ab56 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 2020-06-18 14:43:00 +02:00
Bjarke Berg
6d30f31134 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-06-18 14:41:40 +02:00
Bjarke Berg
fe7d4ed3e9 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-remaining-trees 2020-06-17 18:05:40 +02:00
Bjarke Berg
3a33e7bf29 Migrated ControllerContentTests.. Right now the test fails, but the test is correct 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-17 16:39:28 +02:00
Bjarke Berg
a6b23fbfa0 Entity controller migrated 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-15 13:07:49 +02:00
Bjarke Berg
cf7ed273d7 Fix import/export 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-15 08:52:03 +02:00