yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,606 Commits 4 Branches 7 Tags
8d7ec23f6913f3c1029b272f94de2bce0146ac32
Commit Graph

36606 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laura Weatherhead
51895c73d0 Update usage guidance 
- Reflect optional nature of callback
- Show actual property name to reference
 2020-10-26 10:18:57 +10: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
BatJan
83fa1c2297 Convert a to button 2020-10-23 17:02:51 +02:00
Kenn Jacobsen
d4e624e9fa Do not remove files from media editors when hitting enter 2020-10-23 16:24:15 +02:00
Poornima Nayar
11dcef9b48 Fix - user delete shows notifications twice 2020-10-23 16:17:27 +02:00
Bjarke Berg
7f9c1bb998 Merge pull request #9259 from umbraco/netcore/feature/migrate-persistance-tests 
Netcore: Migrate Persistance Tests
 2020-10-23 16:12:46 +02:00
Niels Lyngsø
cb902c4e08 Fail if settings elementType isnt supported + concept for inner-blocks + debounce for storage update 2020-10-23 15:08:27 +02:00
Sebastiaan Janssen
2d931877be Bump version to 8.8.1 2020-10-23 14:41:09 +02:00
Bjarke Berg
109ccb19b3 Merge pull request #9252 from umbraco/netcore/feature/AB8969-email-message-abstraction 
NetCore: Email message abstraction
 2020-10-23 14:20:10 +02:00
Bjarke Berg
b2b297ac8a Cleanup tests + Fixed issue in IOHelper related to contentroot vs webroot 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-23 13:58:30 +02:00
Bjarke Berg
5fe849c8e2 https://github.com/umbraco/Umbraco-CMS/pull/9252 - Changed EmailMessage to be completely immutable 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-23 12:37:23 +02:00
Bjarke Berg
f791bd4426 Fixed unit test, by injecting IHttpContextAccessor instead of using HttpContext directly. Not the test class is mockable again 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-23 10:36:47 +02:00
Mole
523a155d88 Fix integration test csproj 2020-10-23 10:11:35 +02:00
Mole
f6316c72dc Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-persistance-tests 2020-10-23 08:39:20 +02:00
Bjarke Berg
6e7f0502a3 Merge pull request #9221 from anthonydotnet/unique-nodename-refactor 
Unique node name unit test fix & refactor
 2020-10-23 07:16:25 +02:00
Shannon
e7d22e24db ensures middleware is registered and the external cookie auth is registered. 2020-10-23 14:57:35 +11:00
Shannon
061529c40d Merge branch 'netcore/dev' into netcore/task/6973-migrating-authenticationcontroller-merge 
# Conflicts:
#	src/Umbraco.Core/Constants-Security.cs
#	src/Umbraco.Core/Models/Identity/IIdentityUserLogin.cs
#	src/Umbraco.Core/Persistence/Repositories/IExternalLoginRepository.cs
#	src/Umbraco.Core/Services/IExternalLoginService.cs
#	src/Umbraco.Infrastructure/BackOffice/BackOfficeUserManager.cs
#	src/Umbraco.Infrastructure/BackOffice/BackOfficeUserStore.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/Persistence/Factories/ExternalLoginFactory.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ExternalLoginRepository.cs
#	src/Umbraco.Infrastructure/Services/Implement/ExternalLoginService.cs
#	src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
#	src/Umbraco.Web.BackOffice/Controllers/DenyLocalLoginAuthorizationAttribute.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
#	src/Umbraco.Web.BackOffice/Extensions/HtmlHelperBackOfficeExtensions.cs
#	src/Umbraco.Web.Common/Security/ExternalSignInAutoLinkOptions.cs
#	src/Umbraco.Web.UI.Client/src/common/interceptors/_module.js
#	src/Umbraco.Web.UI.Client/src/common/interceptors/requiredheaders.interceptor.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
#	src/Umbraco.Web/Editors/AuthenticationController.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/Filters/IsCurrentUserModelFilterAttribute.cs
#	src/Umbraco.Web/OwinExtensions.cs
#	src/Umbraco.Web/Security/AppBuilderExtensions.cs
#	src/Umbraco.Web/Security/AuthenticationManagerExtensions.cs
#	src/Umbraco.Web/Security/AuthenticationOptionsExtensions.cs
#	src/Umbraco.Web/Security/BackOfficeClaimsPrincipalFactory.cs
#	src/Umbraco.Web/Services/IconService.cs
#	src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
#	src/Umbraco.Web/ViewDataExtensions.cs
 2020-10-23 14:33:32 +11:00
Shannon
64d8b56eca It builds! 2020-10-23 14:18:53 +11:00
Shannon
1400a02798 Merge branch 'netcore/dev' into netcore/task/6973-migrating-authenticationcontroller 
# Conflicts:
#	src/Umbraco.Core/Constants-Security.cs
#	src/Umbraco.Infrastructure/BackOffice/BackOfficeClaimsPrincipalFactory.cs
#	src/Umbraco.Infrastructure/BackOffice/BackOfficeUserManager.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
#	src/Umbraco.Web.BackOffice/Controllers/DenyLocalLoginAuthorizationAttribute.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
#	src/Umbraco.Web.BackOffice/Extensions/HtmlHelperBackOfficeExtensions.cs
#	src/Umbraco.Web.BackOffice/Services/IconService.cs
#	src/Umbraco.Web.Common/Security/ExternalSignInAutoLinkOptions.cs
#	src/Umbraco.Web.UI.Client/src/common/interceptors/_module.js
#	src/Umbraco.Web.UI.Client/src/common/interceptors/requiredheaders.interceptor.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
#	src/Umbraco.Web/Editors/AuthenticationController.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/Filters/IsCurrentUserModelFilterAttribute.cs
#	src/Umbraco.Web/Security/AppBuilderExtensions.cs
#	src/Umbraco.Web/Security/AuthenticationOptionsExtensions.cs
#	src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
 2020-10-23 10:10:02 +11:00
Bjarke Berg
1dd7384747 Merge remote-tracking branch 'origin/netcore/netcore' into unique-nodename-refactor 2020-10-22 20:04:14 +02:00
Bjarke Berg
532bbb7050 Merge pull request #9251 from umbraco/netcore/feature/compose_controllers 
Netcore: Cleanup + Compose of controllers
 2020-10-22 19:58:27 +02:00
Mole
8e321b4364 Migrate Querying tests 2020-10-22 15:31:56 +02:00
Mole
b28548849f Migrate the bare minimum of BaseUsingSqlCeSyntax to be able to migrate NPoco unit tests 2020-10-22 15:17:16 +02:00
Elitsa Marinovska
d7eca3d0d5 Abstracting MailMessage 2020-10-22 15:08:07 +02:00
Sebastiaan Janssen
5b9e2dbad8 Revert "umb-confirmation directive: move trashcan into directive and address accessibility issues (#8198)" 
This reverts commit 1cd79d81af.

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html

(cherry picked from commit f9b49fc5f3)
(cherry picked from commit 22a1423324)
 2020-10-22 15:08:06 +02:00
Niels Lyngsø
99e2990d07 Emit event if localStorage changes from another tab 2020-10-22 15:07:45 +02:00
Niels Lyngsø
310c8ec924 finish feature + clean up 2020-10-22 15:02:25 +02:00
Mole
016d3f2b5b Move NPoco unit tests back out of Integration tests 2020-10-22 14:50:01 +02:00
Sebastiaan Janssen
b989457716 Merge branch 'v8/8.8' into v8/dev 2020-10-22 14:36:37 +02:00
Sebastiaan Janssen
a6fe82015e Merge branch 'v8/8.7' into v8/dev 2020-10-22 14:36:22 +02:00
Sebastiaan Janssen
b1b540e687 Merge branch 'v8/8.6' into v8/dev 2020-10-22 14:36:10 +02:00
Sebastiaan Janssen
ba6921ce6f Merge branch 'v8/8.7' into v8/8.8 2020-10-22 14:34:00 +02:00
Sebastiaan Janssen
f3e37428ad Merge branch 'v8/8.6' into v8/8.7 2020-10-22 14:29:53 +02:00
Sebastiaan Janssen
9202550537 Remove unused usings 2020-10-22 14:25:57 +02: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
afa754067b Merge branch 'v8/8.7' into v8/dev 2020-10-22 14:18:53 +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
e368607a4d Bump version to 8.8.1 2020-10-22 14:15:57 +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
Mole
ba262648d9 Migrate NPocoTests 2020-10-22 14:12:07 +02:00
Sebastiaan Janssen
3bb01e9418 Bump version to 8.7.1 2020-10-22 14:10:19 +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
843ea1d854 Bump version to 8.6.6 2020-10-22 13:56:15 +02:00
Shannon
22a7f94921 Merge branch 'temp_8879' of https://github.com/dawoe/Umbraco-CMS into v8/contrib 
(cherry picked from commit 069529e9e2)
 2020-10-22 13:52:45 +02:00
Shannon
a6101ce499 Merge branch 'dawoe-temp_8879' into v8/contrib 
(cherry picked from commit 35bf59dee4)
 2020-10-22 13:52:10 +02:00
Bjarke Berg
ca8e54ffc6 https://github.com/umbraco/Umbraco-CMS/pull/9248> 
- Removed BackOfficeArea
- Injected IEmailSender
- Uses nameof instead of magic strings
- Uses GetControllerName instead of magic strings

Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-22 13:37:47 +02:00
Mole
4f80ebd788 Migrate UnitOfWorkTests 2020-10-22 13:27:24 +02:00
Mole
14c55177f3 Migrate StylesheetRepositoryTest 2020-10-22 13:08:27 +02:00
Sebastiaan Janssen
81cbe365f6 Revert "Revert "Revert "umb-confirmation directive: move trashcan into directive and address accessibility issues (#8198)""" 
This reverts commit c903a01f15.
 2020-10-22 12:33:45 +02:00
Sebastiaan Janssen
f3af025c79 Revert "Takes the last commit from #9216 to make umb-confirm-action backwards compatible" 
This reverts commit 174909d735.
 2020-10-22 12:33:19 +02:00