commit e0aa430d4c
Author: Paul Johnson <pmj@umbraco.com>
Date: Thu May 19 10:00:57 2022 +0100
Fix typo in pipeline yaml
commit 2ec450f2d6
Author: Paul Johnson <pmj@umbraco.com>
Date: Thu May 19 09:14:47 2022 +0100
Fix yaml conditions
commit c2d548039a
Author: Paul Johnson <pmj@umbraco.com>
Date: Thu May 19 09:02:50 2022 +0100
Azure pipeline refactor (#12428)
* Skip symbols for Umbraco.Templates
* Resolve some test issues
+ Fixed whitespace dependant tests to pass regardless of build OS vs
run OS.
+ Snap dictionary tests were failing when Configuration was release
+ Removed hardcoded baseUrl from one of the acceptance tests
* Move docfx setup to ./build and fix
* Update UI docs title
* Added dockerfile that can be used when running the acceptance tests.
* Take explicit dependency on System.Security.Cryptography.Pkcs
* Refactor ci/cd pipeline
commit ee8359af75
Author: Mole <nikolajlauridsen@protonmail.ch>
Date: Thu May 19 09:57:21 2022 +0200
V10: Reintroduce appsettings-schema.json (#12416)
* Reintroduce language files tests (#12367)
* Reintroducing language files tests
* Fix casing
* Update tests/Umbraco.Tests.UnitTests/Umbraco.Core/EmbeddedResources/LanguageXmlTests.cs
Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
* Change Umbraco.Cms and Umbraco.Templates nuspecs to csproj
* Remove Umbraco.Templates from VerifyNuGet step
* Remove duplicate and unnecessary properties
* Generate json schema on build
* Add targets file
* Gitignore auto generated appsettings schema
* Fix build not copying file
* Use the new path in appsettings
* Update copy message
* Build json schema as release
* Update json schema options
Otherwise just running the project will put the file in the wrong place
* Generate schema if it doesn't exist in Web.Ui
* Update json schema options
Otherwise just running the project will put the file in the wrong place
Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
Co-authored-by: Ronald Barendse <ronald@barend.se>
commit dd617ede80
Author: Ronald Barendse <ronald@barend.se>
Date: Thu May 19 09:51:11 2022 +0200
v10: Change Umbraco.Cms and Umbraco.Templates nuspecs to csproj (#12413)
* Reintroduce language files tests (#12367)
* Reintroducing language files tests
* Fix casing
* Update tests/Umbraco.Tests.UnitTests/Umbraco.Core/EmbeddedResources/LanguageXmlTests.cs
Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
* Change Umbraco.Cms and Umbraco.Templates nuspecs to csproj
* Remove Umbraco.Templates from VerifyNuGet step
* Remove duplicate and unnecessary properties
Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
commit b83216876f
Author: Ronald Barendse <ronald@barend.se>
Date: Thu May 19 08:36:04 2022 +0200
v10: Project template database/connection string improvements (#12407)
* Add new connection-string-provider-name parameter
* Use template value forms to correctly encode JSON values
* Add new development-database-type parameter
* Update package template and fix App_Plugins directory rename
* Remove conflicting short parameter name
* Lowercase framework parameter to align with MS templates
* Cleanup default template settings
* Write unattended install parameters when either connection string or development database is set
* Include RootNamespace in UmbracoPackage template
* Update Umbraco specific gitignore rules
* Revert "Lowercase framework parameter to align with MS templates"
This reverts commit 22de389272a7e119df569ec2e54190265f6d0ae0.
* Add exclude-gitignore parameter
* Update template schemas
* Add minimal-gitignore parameter
commit e40049dcf1
Author: Mole <nikolajlauridsen@protonmail.ch>
Date: Wed May 18 15:22:51 2022 +0200
Fix domain for invariant content nodes (#12405)
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
commit a3692b887a
Author: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
Date: Mon May 9 11:42:10 2022 +0200
Use SnippetCollection to when working with snippets (#12355)
* Introducing a new Snippet type
* Adding a SnippetCollection and SnippetCollectionBuilder
* Using snippetCollection to get the snippets instead of fileService
* Fixed fetching the correct content
* Make ISnippet non-discoverable
* Split the SnippetCollection into PartialViewSnippetCollection and PartialViewMacroSnippetCollection
* Update CodeFileController to use the 2 snippet collections
* Display the names with Empty.cshtml on top
* Remove merging embedded snippets with custom snippets from ~\Umbraco.Web.UI\umbraco\PartialViewMacros\Templates folder for the Partial View Collection
* Fix naming
* Fix another naming
* Cleanup + Use base items
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
(cherry picked from commit 9326cc5fc6)
commit 4f48a4937b
Author: patrickdemooij9 <patrickdemooij98@hotmail.com>
Date: Fri Oct 8 11:18:00 2021 +0200
Cherry picked from 4c08b44684
commit 4fdbfee597
Author: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Wed May 11 00:51:37 2022 +0200
Show nicer overlay when clicking block card for deleted element type (#12140)
* Show nicer overlay when clicking block card for deleted element type
* Cleanup
* Remove stop-scrolling container
* Use flex-start instead on start
* Remove legacy flexbox fallback
* Remove unnecessary hack
* Use standard gap property instead
* Localization of message
* Fix translation
* End sentence with a dot
(cherry picked from commit ebb1dc21a9)
commit 3856bf8288
Author: Henk Jan Pluim <henkjan.pluim@greenchoice.nl>
Date: Mon Apr 25 10:02:06 2022 +0200
#fix 12254 return emptyresult
(cherry picked from commit 7993d19c1b)
commit 7087c3d9f6
Author: Ronald Barendse <ronald@barend.se>
Date: Tue May 17 12:59:01 2022 +0200
v10: Use ForceCreateDatabase during unattended install and extend GetUmbracoConnectionString extension methods (#12397)
* Add extension methods to get the Umbraco connection string/provider name from configuration
* Added tests for configuration extension methods.
* Fix issue with InstallMissingDatabase and ForceCreateDatabase
* Fix comments
* Revert casing change in GenerateConnectionString
* Re-add AddOptions (without config binding) to fix test
* Update src/Umbraco.Core/Configuration/Models/ConnectionStrings.cs
Co-authored-by: Ronald Barendse <ronald@barend.se>
* Update src/Umbraco.Core/Configuration/Models/ConnectionStrings.cs
* Update src/Umbraco.Infrastructure/Runtime/RuntimeState.cs
* Whitespace and documentation updates
* Add DatabaseProviderMetadataExtensions
* Filter before ordering
* Replace DataDirectory placeholder when setting connection string
Co-authored-by: Andy Butland <abutland73@gmail.com>
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
(cherry picked from commit 8e6e262c7f)
commit e90bf26577
Author: Ronald Barendse <ronald@barend.se>
Date: Tue May 17 07:33:54 2022 +0200
v10: Support System.Data.SqlClient provider name (#12408)
* Add support for System.Data.SqlClient provider name
* Only update connection string when required
(cherry picked from commit e82bcb1b76)
commit fd0637c96d
Author: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
Date: Mon May 16 14:23:59 2022 +0200
Reintroduce language files tests (#12367)
* Reintroducing language files tests
* Fix casing
* Update tests/Umbraco.Tests.UnitTests/Umbraco.Core/EmbeddedResources/LanguageXmlTests.cs
Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
(cherry picked from commit 2ed71a64ec)
* Update language models to get and set manual name
* Save custom language name in controller
* Rewrite AngularJS language edit view and controller
* Cleanup language overview
* Remove icon from language overview
* Make styling of control group the same as properties
* Ensure both ISO code and culture name are set in language model
* Use new language model constructor
* Update tests to use new language constructor
* Update culture name in dictionary package export
* Use language name in dictionary
* Fix language nullability issues
* Cleanup GetAllCultures and added null checks
* Re-add obsolete constructors
* Make language name required and update Cypress test
* Fix routing/saveNewLanguages Cypress test
* Make language name optional (improved backwards compatibility)
Co-authored-by: Ronald Barendse <ronald@panoramastudios.nl>
* Upgraded MailKit
* Upgraded Microsoft.* packages
* Upgrades various nuget packages to latest version
* Upgrades various nuget packages related to test
* update package-lock.json to new npm format
* bump all angular dependencies to latest 1.8.3
* bump jquery to 3.6.0
* remove dubious 'npm' dependency and set engines versions to avoid warnings
* bump signalr dependency from v3 to v6
* bump 'underscore' from 1.12.1 to 1.13.1
* bump 'diff' from 3.5.0 to 5.0.0
* bump 'clipboard' from 2.0.4 to 2.0.10
* bump 'flatpickr' from 4.6.9 to 4.6.13
* bump 'moment' from 2.22.2 to 2.29.3
* bump 'spectrum-colorpicker2' from 2.0.8 to 2.0.9
* bump 'underscore' from 1.13.1 to 1.13.2
* update 'less' 'autoprefixer' 'cssnano' and accompanying gulp tasks to latest
* bump all gulp dependencies
except gulp-imagemin since we do not yet support esmodules in the backoffice client
* remove 'fs' since the package is marked as malicious and do not seem to be used
* update AcceptanceTests lockfile to latest npm + dependency updates
* bump '@babel/core' from 7.17.5 to 7.17.9
* bump karma dependencies to latest
* bump 'animejs' from 2.2.0 to 3.2.1
* bump 'jasmine-core' from 3.5.0 to 4.1.0
* remove deduped 'caniuse-lite'
* bump wicg-inert from ^3.0.2 to 3.1.1
* bump 'nouislider' from 15.5.0 to 15.5.1
* add slight delay for confirmation overlay
* ignore postinstall task for acceptance tests since env file is generated manually
* upgrade cypress to 9.5.4
* add wait step to content.ts tests
* Revert "ignore postinstall task for acceptance tests since env file is generated manually"
This reverts commit 61acebfda2502499480f31d8450c889d4c5c6f11.
* increate wait amount of content rollback tests
* Revert "upgrade cypress to 9.5.4"
This reverts commit 2febf139a41938ae005754abd958fdec1f598991.
* Revert "update AcceptanceTests lockfile to latest npm + dependency updates"
This reverts commit b45d20b3cdcae6b17d4024c7085c5e6a3e3e2a83.
* update lockfile version
* update umbraco-cypress-testhelpers to latest
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
* 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>
* 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>
* Fix relation type tests
* Fix saving content not updating the UI
We have to map to display after we've saved content or we'll be missing information generated when saving content such as ID
* Dont map to display to get isBlueprint
* ContentVersion cleanup backoffice UI (#11637)
* init rollback ui prototype
* add busy state to button, deselect version, add pagination status
* add localisation
* style current version
* disable rollback button when nothing is selected
* stop click event
* Endpoints for paginated content versions.
Light on tests, tight on time.
* Endpoints to "pin" content versions
* camel case json output.
Not sure why json formatter not set for controller, bit risky to add it now
* wire up paging
* wire up pin/unpin
* rename getPagedRollbackVersions to getPagedContentVersions
* prevent selection of current version and current draft
* add current draft and current version to UI
* remove pointer if the row is not selectable
* Improve warning for globally disabled cleanup feature.
* Fix current loses prevent cleanup state on publish.
* Added umbracoLog audit entries for "pin" / "unpin"
* Match v9 defaults for keepVersions settings
* Fix - losing preventCleanup on save current with content changes
* update pin/unpin button labels
* fix pagination bug
* add missing "
* always send culture when a doc type can vary
Co-authored-by: Mads Rasmussen <madsr@hey.com>
# Conflicts:
# src/Umbraco.Core/ContentEditing/ContentVersionMetaViewModel.cs
# src/Umbraco.Core/Models/HistoricContentVersionMeta.cs
# src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
# src/Umbraco.Tests/Persistence/Repositories/DocumentVersionRepository_Tests_Integration.cs
# src/Umbraco.Tests/Services/ContentVersionCleanupService_Tests_UnitTests.cs
# src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
# src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
# src/Umbraco.Web.UI/config/umbracoSettings.Release.config
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# src/Umbraco.Web/Umbraco.Web.csproj
* Added tests
* Misc - missed translation update
* Bugfix - DocumentVersionRepository.Get should not join culture variation
* Bugfix - Missing write lock
* Removed unnecessary view model
* Misc - kill some warnings
* Misc - Kill some more warnings
* Fixed cypress rollback test
* Bugfix - Policy returns items to delete not items to keep.
Switch to inverse behavior.
# Conflicts:
# src/Umbraco.Tests/Services/DefaultContentVersionCleanupPolicy_Tests_UnitTests.cs
Co-authored-by: Paul Johnson <pmj@umbraco.com>
* downgraded cypress, updated package
* Fixed language test
* Fix language test
* Fixed routing tests to wait for popup
* Publish test artifacts
* Added better element to wait on
* Fix routing tests for linux
* Fix language tests on linux
* Stablize tabs tests
* Implement waiting for inner tree like in content tests
* Assert that we are in settings section so we dont click an element that doesnt exist
* Fixed rollback by not doing cy.reload()
* Fix language test with correct wait
* Stabilize dataTypes by moving API Call, and stabilize systemInformation.ts test by waiting for success notification
* Fix dataTypes, tabs and template tests
* Update node to newer version in package-lock.json and fix template test
* Implemented cy.wait to test if it is because we are too fast
* Added comments
* Bigger wait
* Try another wait instead of magic numbers
Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
* add create language test
* add create language test
* fix bug, move test to new folder and add type definitions
* update to use culture command
Co-authored-by: Jesper <jmh@umbraco.dk>
* fixed flaky macro test and updated cypress version
* fixed flaky macro test and updated cypress version
* Update package.json
* Fixed failing tabs test
* Amend magic numbers with actual wait
* Update tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
* Updated UI to click on button instead of icon
* Make macro test click bottom to ensure we're not clicking on icon
Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
(cherry picked from commit 34be464cf8)
# Conflicts:
# tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Tabs/tabs.ts
* fixed flaky macro test and updated cypress version
* fixed flaky macro test and updated cypress version
* Update package.json
* Updated cypress to 8.6 and fixed failing script test
* Updated cypress to 8.6 and fixed failing script test
* Update package-lock.json
* Fixed Scripts and stylesheet tests with proper waits instead of magic numbers
* Updated to newest version of cypress and fixed template test
* Remove duplicate click
* Revert version to 8.4.1
* changed template
Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
(cherry picked from commit e9ae567617)
# Conflicts:
# src/Umbraco.Tests.AcceptanceTest/package.json
# tests/Umbraco.Tests.AcceptanceTest/package-lock.json
* fixed flaky macro test and updated cypress version
* fixed flaky macro test and updated cypress version
* Update package.json
* Updated cypress to 8.6 and fixed failing script test
* Updated cypress to 8.6 and fixed failing script test
* Update package-lock.json
* Fixed Scripts and stylesheet tests with proper waits instead of magic numbers
* Updated to newest version of cypress and fixed template test
* Remove duplicate click
* Revert version to 8.4.1
* changed template
Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
