yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,114 Commits 4 Branches 7 Tags
037580b305d0b0771dbe7f5e0f40dfdceeae62ec
Commit Graph

41114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Johnson
1810cec80a Simplify registration for ambiguous ctor 
ActivatorUtilitiesConstructor respected.
 2022-01-31 08:39:33 +00:00
Bjarne Fyrstenborg
472cc716c4 Accept zip as extension in local package installer (#11109) 
* Update ngf-pattern and accept

* Restructure less

* Remove ng-invalid again
 2022-01-31 02:40:15 +01:00
andreymkarandashov
3167c8b213 encode group name to avoid the issue 2022-01-31 01:35:03 +01:00
Arul Prabakaran
2abf455abf Updated border radius of .umb-notifications__notification to match button radius (#11745) 2022-01-31 09:08:51 +10:00
Bjarne Fyrstenborg
f2450fb539 Constant icon blueprint (#11812) 
* Add constant for blueprint icon

* Use constant for folder icon

* Create empty array of IEntitySlim as the GetAll() method returns IEnumerable<IEntitySlim>

* Use constant
 2022-01-31 08:34:37 +10:00
Mole
c0dfb33916 Fix importing DocType if parent folder already exists (#11885) 
* Don't try to create parent folder if it already exists

* Fix typo

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2022-01-28 12:30:44 +01:00
Lennard Fonteijn
477697a70c Removed if-check to allow empty values from blocks 2022-01-28 03:43:53 +01:00
Bjarke Berg
5de36f5669 Merge pull request #11916 from umbraco/v9/feature/merge_v8_27012022 
V9/feature/merge v8 27012022
 2022-01-27 17:38:32 +01:00
Bjarke Berg
a71529a058 V9/feature/merge v8 27012022 (#11915) 
* Add allowlist for HelpPage

* Use current request for emails (#11775)

* Use current request for emails

* Fix tests

* Bump version to 8.17.2

* Use Umbraco Path instead of constant

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
 2022-01-27 17:37:32 +01:00
Bjarke Berg
deff17e622 Merge remote-tracking branch 'origin/v8/dev' into v9/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/ConfigsExtensions.cs
#	src/Umbraco.Core/Constants-AppSettings.cs
#	src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/Editors/AuthenticationController.cs
#	src/Umbraco.Web/Editors/HelpController.cs
#	src/Umbraco.Web/Editors/UsersController.cs
 2022-01-27 17:35:47 +01:00
Bjarke Berg
8c822c59ac Merge remote-tracking branch 'origin/v8/8.17' into v8/dev 
# Conflicts:
#	src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
#	src/Umbraco.Web/Editors/AuthenticationController.cs
#	src/Umbraco.Web/Editors/UsersController.cs
 2022-01-27 16:04:50 +01:00
Bjarke Berg
c79380191b Use Umbraco Path instead of constant 2022-01-27 15:57:22 +01:00
Bjarke Berg
a779803763 Bump version to 8.17.2 2022-01-27 13:18:21 +01:00
Mole
1b98f8985e Use current request for emails (#11775) 
* Use current request for emails

* Fix tests
 2022-01-27 12:59:45 +01:00
Bjarke Berg
7971f36b78 Add check for PluginControllerAttribute and compare area name (#11911) 
* Add check for PluginControllerAttribute and compare area name

* Added null check
 2022-01-27 10:32:56 +01:00
Mole
c73d0bf6a6 Update logging message in HelpController 2022-01-27 09:53:16 +01:00
Mole
de6824dfa0 Merge pull request #11909 from umbraco/v9/feature/allowlist-for-help-page 
V9: Add allowlist for HelpPage
 2022-01-26 13:25:45 +01:00
Mole
56d54d441f Merge pull request #11907 from umbraco/v8/feature/allowlist-for-help-page 
V8: Add allowlist for HelpPage
 2022-01-26 13:07:40 +01:00
Bjarke Berg
d4c43b69f7 Updated to use IOptionsMonitor 2022-01-26 12:40:14 +01:00
Ronald Barendse
4d4aff4c67 Apply changes from #11805 and #11806 to v9 (#11904) 
* Apply changes from #11805 and #11806 to v9

* Update documentation and cleanup code styling
 2022-01-26 12:22:05 +01:00
Mole
3261a6f71d Fix up for V9 2022-01-26 12:12:59 +01:00
Mole
2f17d766be Cherry pick Add allowlist for HelpPage 2022-01-26 11:43:59 +01:00
Mole
9dbe2d211c Add allowlist for HelpPage 2022-01-26 10:57:49 +01:00
Mole
72533d29c8 Specify namespace for CharITem 2022-01-26 10:20:12 +01:00
Mole
2ddb3e13e5 Fix breaking changes 2022-01-26 10:05:01 +01:00
Mole
3ade2b6de3 Add RC to version 2022-01-26 08:43:43 +01:00
Mole
6ad08a3b29 Merge branch 'v9/dev' into v9/9.3 2022-01-26 08:33:56 +01:00
Bjarke Berg
930bdac45e Merge remote-tracking branch 'origin/v9/feature/add-html-sanitizer-abstraction' into v9/dev 
# Conflicts:
#	src/Umbraco.Core/Security/IHtmlSanitizer.cs
#	src/Umbraco.Core/Security/NoopHtmlSanitizer.cs
 2022-01-26 08:02:04 +01:00
Bjarke Berg
160d9fb96b Merge remote-tracking branch 'origin/v8/dev' into v9/dev 
# Conflicts:
#	src/Umbraco.Core/Composing/CompositionExtensions/Services.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
 2022-01-26 07:58:04 +01:00
Mole
d70a207d60 V8: Add ability to implement your own HtmlSanitizer (#11897) 
* Add IHtmlSanitizer

* Use IHtmlSanitizer in RTE value editor

* Add docstrings to IHtmlSanitizer

* Rename NoOp to Noop

To match the rest of the classes

* Fix tests
 2022-01-26 07:51:25 +01:00
Ronald Barendse
76593aa7ca Add IsRestarting property to Umbraco application notifications (#11883) 
* Add IsRestarting property to Umbraco application notifications

* Add IUmbracoApplicationLifetimeNotification and update constructors

* Only subscribe to events on initial startup

* Cleanup CoreRuntime

* Do not reset StaticApplicationLogging instance after stopping/during restart
 2022-01-25 06:39:49 +01:00
Ronald Barendse
ca56e0971f Add IsRestarting property to Umbraco application notifications (#11883) 
* Add IsRestarting property to Umbraco application notifications

* Add IUmbracoApplicationLifetimeNotification and update constructors

* Only subscribe to events on initial startup

* Cleanup CoreRuntime

* Do not reset StaticApplicationLogging instance after stopping/during restart
 2022-01-25 06:38:20 +01:00
Mole
39f7102312 Use IHtmlSanitizer in RichTextValueEditor 2022-01-24 09:30:23 +01:00
Mole
249774c815 Rename NoOp to Noop 
To match the rest of the classes
 2022-01-24 09:24:40 +01:00
Mole
01c1e68cf0 Fix up namespaces 2022-01-24 09:19:06 +01:00
Mole
e2d0a0f699 Add docstrings to IHtmlSanitizer 2022-01-24 09:18:31 +01:00
Mole
8b773c90c2 Add IHtmlSanitizer 2022-01-24 08:56:53 +01:00
Bjarke Berg
4b92a47e93 Merge remote-tracking branch 'origin/v9/9.3' into v9/dev 
# Conflicts:
#	build/templates/UmbracoPackage/.template.config/template.json
#	build/templates/UmbracoProject/.template.config/template.json
 2022-01-23 13:44:33 +01:00
Bjarke Berg
f49b661c26 Merge remote-tracking branch 'origin/v9/9.2' into v9/9.3 
# Conflicts:
#	build/templates/UmbracoPackage/.template.config/template.json
#	build/templates/UmbracoProject/.template.config/template.json
#	src/Directory.Build.props
#	src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
 2022-01-23 13:43:34 +01:00
Bjarke Berg
b7d8b7923d Merge remote-tracking branch 'origin/v9/9.2' into v9/dev 
# Conflicts:
#	build/templates/UmbracoPackage/.template.config/template.json
#	build/templates/UmbracoProject/.template.config/template.json
#	src/Directory.Build.props
#	src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
 2022-01-23 13:34:39 +01:00
Bjarke Berg
4843b28184 added contains check for acceptance tests 2022-01-21 19:30:38 +01:00
Bjarke Berg
eb126a77b6 Merge pull request #11893 from umbraco/v9/merge-v9-contrib-into-v9-dev 
Merge v9 contrib into v9 dev
 2022-01-21 13:18:35 +01:00
Bjarke Berg
12abd883a9 Member 2FA (#11889) 
* Bugfix - Take ufprt from form data if the request has form content type, otherwise fallback to use the query

* External linking for members

* Changed migration to reuse old table

* removed unnecessary web.config files

* Cleanup

* Extracted class to own file

* Clean up

* Rollback changes to Umbraco.Web.UI.csproj

* Fixed migration for SqlCE

* Added 2fa for members

* Change notification handler to be on deleted

* Update src/Umbraco.Infrastructure/Security/MemberUserStore.cs

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>

* updated snippets

* Fixed issue with errors not shown on member linking

* fixed issue with errors

* clean up

* Fix issue where external logins could not be used to upgrade Umbraco, because the externalLogin table was expected to look different. (Like after the migration)

* Fixed issue in Ignore legacy column now using result column.

* Updated 2fa for members + publish notification when 2fa is requested.

* Changed so only Members out of box supports 2fa

* Cleanup

* rollback of csproj file, that should not have been changed

* Removed confirmed flag from db. It was not used.

Handle case where a user is signed up for 2fa, but the provider do not exist anymore. Then it is just ignored until it shows up again

Reintroduced ProviderName on interface, to ensure the class can be renamed safely

* Bugfix

* Registering DeleteTwoFactorLoginsOnMemberDeletedHandler

* Rollback nuget packages added by mistake

* Update src/Umbraco.Infrastructure/Services/Implement/TwoFactorLoginService.cs

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>

* Update src/Umbraco.Infrastructure/Persistence/Repositories/Implement/TwoFactorLoginRepository.cs

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>

* Added providername to snippet

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
 2022-01-21 13:10:34 +01:00
Bjarke Berg
52a3e285a9 Merge remote-tracking branch 'origin/v8/dev' into v9/dev 
# Conflicts:
#	src/Umbraco.Core/Composing/CompositionExtensions/Services.cs
#	src/Umbraco.Core/Constants-AppSettings.cs
#	src/Umbraco.Core/Dashboards/ContentDashboardSettings.cs
#	src/Umbraco.Core/Dashboards/IContentDashboardSettings.cs
#	src/Umbraco.Core/Manifest/ManifestParser.cs
#	src/Umbraco.Core/Manifest/PackageManifest.cs
#	src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Core/Models/PropertyTagsExtensions.cs
#	src/Umbraco.Core/PropertyEditors/ComplexPropertyEditorContentEventHandler.cs
#	src/Umbraco.Core/PropertyEditors/ConfigurationEditor.cs
#	src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValue.cs
#	src/Umbraco.Core/Serialization/JsonToStringConverter.cs
#	src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
#	src/Umbraco.Core/Telemetry/ITelemetryService.cs
#	src/Umbraco.Core/Telemetry/Models/PackageTelemetry.cs
#	src/Umbraco.Core/Telemetry/Models/TelemetryReportData.cs
#	src/Umbraco.Core/Telemetry/TelemetryService.cs
#	src/Umbraco.Tests/Manifest/ManifestParserTests.cs
#	src/Umbraco.Tests/PropertyEditors/BlockEditorComponentTests.cs
#	src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
#	src/Umbraco.Tests/PropertyEditors/NestedContentPropertyComponentTests.cs
#	src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
#	src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
#	src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
#	src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/BatchedDatabaseServerMessenger.cs
#	src/Umbraco.Web/Cache/DistributedCacheBinder.cs
#	src/Umbraco.Web/Compose/BlockEditorComponent.cs
#	src/Umbraco.Web/Compose/NestedContentPropertyComponent.cs
#	src/Umbraco.Web/Editors/AuthenticationController.cs
#	src/Umbraco.Web/Editors/ContentTypeController.cs
#	src/Umbraco.Web/Editors/DashboardController.cs
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Editors/UsersController.cs
#	src/Umbraco.Web/PropertyEditors/BlockEditorPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ColorPickerConfigurationEditor.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/MediaPicker3PropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/MultipleTextStringPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/MultipleValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
#	src/Umbraco.Web/Telemetry/ReportSiteTask.cs
#	src/Umbraco.Web/Telemetry/TelemetryComponent.cs
#	src/Umbraco.Web/Trees/ContentTreeController.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/WebApi/EnableDetailedErrorsAttribute.cs
 2022-01-21 12:40:18 +01:00
Lantzify
aae8694618 Added description to entityResource.getSafeAlias 2022-01-21 10:56:04 +01:00
Bjarne Fyrstenborg
6a95ff366f Ensure query is not null before using Trim() 2022-01-21 10:54:29 +01:00
dependabot[bot]
c3b619fbbf Bump follow-redirects in /src/Umbraco.Web.UI.Client 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.4 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.4...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-21 10:50:35 +01:00
Sebastiaan Janssen
ecd32bf033 The marked dev dependency was unused 2022-01-21 10:48:22 +01:00
James Jackson-South
4136adebc8 Bump ImageSharp.Web version 2022-01-21 10:06:07 +01:00
Sebastiaan Janssen
8eb3ef65f6 Merge branch 'v9/dev' into v9/contrib 2022-01-21 10:02:37 +01:00