Commit Graph

41398 Commits

Author SHA1 Message Date
Nikolaj Geisle
060e0181a7 Merge remote-tracking branch 'origin/v10/dev' into v10/feature/nullable-reference-types-in-Umbraco.Web.Backoffice
# Conflicts:
#	src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Collections.cs
#	src/Umbraco.Core/Extensions/PublishedContentExtensions.cs
#	src/Umbraco.Core/Telemetry/Models/TelemetryReportData.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MultiUrlPickerValueConverter.cs
#	src/Umbraco.PublishedCache.NuCache/ContentStore.cs
#	src/Umbraco.Web.BackOffice/Trees/MemberTypeTreeController.cs
#	src/Umbraco.Web.Common/ModelsBuilder/InMemoryModelFactory.cs
#	src/Umbraco.Web.Common/Security/MemberManager.cs
#	src/Umbraco.Web.Website/Routing/ControllerActionSearcher.cs
#	src/Umbraco.Web.Website/Routing/IControllerActionSearcher.cs
#	src/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformer.cs
2022-04-21 10:26:51 +02:00
Nikolaj Geisle
c72a4ff188 Fix coordinates.HasValues check 2022-04-21 08:32:59 +02:00
Bjarke Berg
536440b729 Merge pull request #12277 from umbraco/v10/feature/merge-v9dev_20_04_2022
Merge v9dev into v10 20-04-2022
2022-04-21 08:02:28 +02:00
Bjarke Berg
2f1cb4b20a Fix build/tests + cleanup duplicate dependencies 2022-04-20 15:54:09 +02:00
Bjarke Berg
b19dab5f3a Fix merge issues 2022-04-20 15:42:27 +02:00
Bjarke Berg
23a49161d6 Merge remote-tracking branch 'origin/v9/dev' into v10/dev
# Conflicts:
#	build/build.ps1
#	build/templates/UmbracoPackage/.template.config/template.json
#	build/templates/UmbracoProject/.template.config/dotnetcli.host.json
#	build/templates/UmbracoProject/.template.config/ide.host.json
#	build/templates/UmbracoProject/.template.config/template.json
#	src/Umbraco.Core/Constants-System.cs
#	src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Services.cs
#	src/Umbraco.Infrastructure/Security/BackOfficeUserStore.cs
#	src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
#	umbraco-netcore-only.sln
2022-04-20 11:09:28 +02:00
Bjarke Berg
7becf76a02 Added notification when requires user 2fa, so implementors can use this to send emails etc. 2022-04-20 10:56:15 +02:00
Nikolaj Geisle
0d600d6677 Dont return nullable lists 2022-04-20 08:42:06 +02:00
Nikolaj Geisle
927d687192 Fix bad null check 2022-04-20 08:38:14 +02:00
VWA Software internet
7e6e9c7431 Include the PluginController Area when searching for matching surface… (#12218) 2022-04-19 17:58:59 +02:00
Nikolaj
ce6a3d6751 Fix TelemetryServiceTests 2022-04-19 15:19:25 +02:00
Nikolaj Geisle
c07ffb68fc v9: Implement telemetry levels (#12267)
* Add initial classes

* Add TelemetryProviders

* Add new NodeCountService.cs and NodeTelemetryProvider

* Add data contract attribute to UsageInformation

Otherwise it wont serialize correctly

* Implement more providers

* Fix builders and propertyEditorTelemetry

* Add MediaTelemetryProvider

* Add MediaTelemetryProvider

* Fix doubling of media telemetry

* Move contentCount from NodeCountTelemetryProvider and move to ContentTelemetryProvider

* Revert ContentTelemetryProvider changes

* Add detailed information to TelemetryService

* Add integration tests

* Add more tests and todos for tests

* Fix stylecop warnings

* Use yield return instead of instantiating local list

* Implement Macro test

* Inject interface instead of implementation in TelemetryService

* Fix TelemetryServiceTests.cs

* Implement media tests

* Implement propertyTypeTests

* Implement constants instead of hardcoded strings

* Add SystemInformationTelemetryProvider

* Use SystemInformationTableDataProvider in UserDataService

* Implement more properties

* Add UsageInformation

* Replace UserDataService with SystemInformationTelemetryProvider

* Undo changes to UserDataService and obsolete it

* Remove ISystemInformationTableDataProvider

* Register SystemInformationTelemetryProvider as telemetry provider

* Use constants for telemetry names

* Make UserDataServiceTests test SystemInformationTelemetryProvider instead

* Update UserDataServiceTests to cover new data

* Add unit tests

* Add integration test testing expected data is returned

* Implement Analytics dashboard

* Improve assertion message

* Add text and styling to analyticspage

* Rename consent to analytic

* implement save button for consent level

* Implement save button

* Fix system information test

* Add TelemetryResource

* Move telemetry providers to infrastructure

* Add database provider to system information

* Set startvalue for slider

* Fix unit tests

* Implement MetricsConsentService using KeyValueService

* Return void hen setting the telemetry level

* fix startposition when not reloading

* Add a couple tests

* Update src/Umbraco.Core/Services/MetricsConsentService.cs

* Rename ConsentLevel.cs

* Use direct Enum instead of parsing

* rename consent resource

* add lazy database

* refactor slider

* Implement ng-if and propers pips

* Make classes internal

* Fix slider not loading when navigating to tab

* Add telemetry level check to TelemetryService.cs

* Add Consent for analytics text

* Fix build errors for unit tests

* Fix TelemetryServiceTests

* revert package-lock.json

* Fix integration test

* Update slider

* Update TelemetryService.cs

* Apply suggestions from code review

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

Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
Co-authored-by: nikolajlauridsen <nikolajlauridsen@protonmail.ch>
2022-04-19 15:06:10 +02:00
Sebastiaan Janssen
2d31913837 Merge branch 'v9/dev' into v9/contrib 2022-04-19 13:16:20 +02:00
Robert Foster
bef052ad3a V9/tmp nucache lock (#12149)
* wrapping SetAllFastSortedLocked in try catch

* Potential issue mitigation by retrieving all data from the database at once instead of one at a time while populating the NuCache file.

* Moved content retrieval to within the try-catch block.

* using InGroupsOf() to retrieve content without loading absolutely everything into memory.

* added "old" method signatures to prevent breaking change in ContentStore

* Revert code style cleanups for clarity

Co-authored-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
2022-04-19 13:01:38 +02:00
Nikolaj Geisle
89f996902b Merge pull request #12207 from umbraco/v9/bugfix/member-last-login-date
Fix member last login date not being set
2022-04-19 10:31:16 +02:00
Bjarke Berg
c7c3a68691 fixes breaking changes by reintroducing old ctor 2022-04-19 08:55:13 +02:00
Bjarke Berg
852305b7d1 Simplified setup of 2FA for users (#12142)
* Added functionality to enable 2FA for users..

* Do not use the obsolete ctor in tests

* cleanup

* Cleanup

* Convert User view from overlay to infinite editor

* Add support for having additional editors on top of the user (2fa) which overlay does not support
* Add controllerAs syntax in the template
* Remove unused dependencies

* Adjustments to 2fa login view

* organize elements
* add translations
* add a11y helpers
* add autocompletion = one-time-code
* change to controllerAs syntax

* add callback to cancel 2fa and fix error where submit button was not reset when all other validations were

* add a cancel/go back button to the 2fa view

* replace header with something less obstrusive

* move logout button to the footer in the new editor view

* change 'edit profile' to an umb-box and move ng-if for password fields out to reduce amount of checks

* Add umb-box to external login provider section

* add umb-box to user history section

* bug: fix bug where notificationsService would not allow new notifications if removeAll had been called

* add styling and a11y to configureTwoFactor view

- also ensure that the view reloads when changes happen in the custom user view to enable 2fa
- ensure that view updates when disabling 2fa
- add extra button to show options (disable) for each 2fa provider

* add notification when 2fa is disabled

* add data-element to support the intro tour

also changed a minor selector in the cypress test

* correct usage of umb-box with umb-box-content

* do not use the .form class twice to prevent double box-shadow

* make tranlastion for 2fa placeholder shorter

* ensure that field with 2fa provider is always visible when more than 1 provider

* move error state of 2fa field to token field

* update translation of multiple 2fa providers

* move CTA buttons to right side to follow general UI practices

* rename options to disable

* add disabled state

* add helper folders to gitignore so you can work with plugins and custom code without committing it accidentally

* move the disable functionality to its own infinite editor view

* use properties from umb-control-group correctly

* add 'track by' to repeater

* make use of umb-control-group

* remove unused functions

* clean up translations

* add Danish translations

* copy translations to english

* Only return enabled 2fa providers as expected

Co-authored-by: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
2022-04-19 08:33:03 +02:00
Andy Butland
68353f9d06 Fixes RedirectToUmbracoPageResult to handle redirects to pages with domains defined on them (#12259)
* Fixes RedirectToUmbracoPageResult to handle redirects to pages with domains defined on them.

* Renamed variable to match with updated service type.

* Apply suggestions from code review

Co-authored-by: Ronald Barendse <ronald@barend.se>

* Fixed usage of IUrlHelper.

Co-authored-by: Ronald Barendse <ronald@barend.se>
2022-04-19 08:13:24 +02:00
Sebastiaan Janssen
f7615a93d5 Ignore the views folder apart from required files (#12260)
* Ignore the views folder apart from required files

* Only ship the views that we know we want
2022-04-18 02:17:05 +02:00
Sebastiaan Janssen
184397a327 Adds PR first response action 2022-04-15 19:14:23 +02:00
Sebastiaan Janssen
6519b88dfc Fix wrong picker, related to changes in #12122 2022-04-14 14:15:25 +02:00
Sebastiaan Janssen
48dbe959f6 Merge pull request #12249 from umbraco/v9/feature/merge-v9-contrib 2022-04-14 11:44:24 +02:00
Sebastiaan Janssen
70a48596ba The {umbracoApplicationUrl} magic string does nothing here 2022-04-14 10:39:30 +02:00
Sebastiaan Janssen
faa561da2b Fixes error on first running the Web.UI because of an invalid config 2022-04-14 10:06:01 +02:00
Ronald Barendse
df01eabcf1 Merge pull request #12045 from umbraco/v9/feature/projecttemplate-cleanup
Clean up and improve project templates
2022-04-12 16:29:24 +02:00
Ronald Barendse
8969bd23bb Fix UseHttpsRedirect spacing 2022-04-12 16:27:55 +02:00
Sebastiaan Janssen
75613cf061 Revert "Block List Settings throws exception if Models builder mode is set to "Nothing" (#11725)"
This reverts commit 62b289e179.
2022-04-12 13:45:15 +02:00
Sebastiaan Janssen
4e71d6f2f6 Merge branch 'v9/dev' into v9/contrib
# Conflicts:
#	src/Umbraco.Infrastructure/HostedServices/RecurringHostedServiceBase.cs
2022-04-12 13:41:34 +02:00
Ronald Barendse
c0b0a47612 Merge branch 'v9/dev' into v9/feature/projecttemplate-cleanup 2022-04-12 11:16:16 +02:00
Ronald Barendse
20666218d2 Move templates to root 2022-04-12 11:00:59 +02:00
Sebastiaan Janssen
5bac054311 Add discord badge 2022-04-07 16:36:30 +02:00
patrickdemooij9
597d28b399 Remove statuscodepages middleware 2022-04-07 11:03:07 +02:00
Paul Johnson
80c90f23d1 Fix issue - changing a document type broke the nucache data structure (#12209)
(cherry picked from commit 15df448274edb291ae568148c61baa7541615247)
2022-04-06 08:42:10 +01:00
Jeavon
7d8a07e703 Fix KeepAlive Config so that value from appsettings.json is used (#12224)
* Fix KeepAlive Config so that value from appsettings.json is used if present

* update comment to reflect get-set on KeepAlivePingUrl

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
2022-04-06 09:35:53 +10:00
Nikolaj Geisle
8865c5d486 Merge remote-tracking branch 'origin/v10/dev' into v10/feature/nullable-reference-types-in-Umbraco.Web.Backoffice 2022-04-05 11:25:52 +02:00
Paul Johnson
d036c6a118 Fix tests when running filtered set (SQL Server)
Without InstallDefaultDataSettings DatabaseSchemaCreator makes use of
static service locator which isn't wired up in time.
2022-04-05 10:18:04 +01:00
Nathan Woulfe
6423529dd0 ensure proper cleanup to avoid lingering scopes causing memory leaks 2022-04-05 11:14:54 +02:00
Nikolaj Geisle
76c525b611 Merge remote-tracking branch 'origin/v10/dev' into v10/feature/nullable-reference-types-in-Umbraco.Web.Backoffice 2022-04-05 11:11:44 +02:00
Paul Johnson
c34479c2bb Fix tests when running filtered set.
Without InstallDefaultDataSettings DatabaseSchemaCreator makes use of
static service locator which isn't wired up in time.
2022-04-05 10:04:39 +01:00
Nikolaj Geisle
b6402c4cc8 Fix build errors after merge 2022-04-05 09:46:47 +02:00
Nikolaj Geisle
a6128bfe8e Merge branch 'v10/dev' into v10/feature/nullable-reference-types-in-Umbraco.Web.Backoffice
# Conflicts:
#	src/Umbraco.Core/Cache/MacroCacheRefresher.cs
#	src/Umbraco.Core/Services/MacroService.cs
#	src/Umbraco.Core/StaticApplicationLogging.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseDataCreator.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MacroRepository.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/TrackedReferencesRepository.cs
#	src/Umbraco.Infrastructure/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Infrastructure/Security/UmbracoPasswordHasher.cs
#	src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs
2022-04-05 08:51:08 +02:00
Nathan Woulfe
45e7c10cb8 busfy => busy 2022-04-05 01:35:25 +02:00
Johannes Lantz
057b304a5a Added "move" action for dictionaries (#12193)
* Added "move" action for dictionaries

* Replaced DictionaryMove with MoveOrCopy for PostMove

* Removed int parse for dictionary postmove id & parentId, changed paramtype for move in dictionary.resource

* Added localizedText for new dictionary validationProblems &  adjusted nullcheck for move.ParentId

* Fixed logic for move dictionary parent
2022-04-04 17:14:03 +02:00
Nikolaj Geisle
acf60ce84c Update csproj to nullable 2022-04-04 15:02:53 +02:00
Nikolaj Geisle
7994f5c326 Add nullability to Web.Website, Sqlite & SqlServer 2022-04-04 14:47:54 +02:00
Nikolaj Geisle
4710951185 fix build errors 2022-04-04 12:45:06 +02:00
Nikolaj Geisle
57190fc676 Fix BackOfficeServerVariables 2022-04-04 09:50:32 +02:00
Nikolaj Geisle
0a7e698883 Fix non-nullable array to nullable 2022-04-04 09:21:52 +02:00
Bjarne Fyrstenborg
534ca928b4 Use icon component for icons 2022-04-04 08:47:58 +10:00
dependabot[bot]
ddddaeb113 Bump minimist from 1.2.5 to 1.2.6 in /tests/Umbraco.Tests.AcceptanceTest
Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-04 08:46:29 +10:00