Bjarke Berg
a64c58d68e
Merge branch 'v9/9.1' into v9/dev
2021-11-04 12:34:21 +01:00
Nikolaj Geisle
fca16859fd
v9: 11419 Remove Azure gallery from build.ps1 ( #11540 )
...
* Fix build.ps1 & change order of itemgroup in csproj
* Fix merge conflict
* Update package version
Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk >
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk >
2021-11-04 11:05:39 +01:00
Bjarke Berg
7ffa46d4f2
Use specific version of docfx
2021-11-04 07:55:51 +01:00
Sebastiaan Janssen
16b0e85ccb
Merge branch 'v8/dev' into v9/dev
...
# Conflicts:
# src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
# src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tours/backofficeTour.ts
# src/Umbraco.Tests.AcceptanceTest/cypress/integration/Users/users.ts
# src/Umbraco.Tests.AcceptanceTest/cypress/support/commands.js
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Tours/backofficeTour.ts
# tests/Umbraco.Tests.AcceptanceTest/package-lock.json
2021-11-03 17:12:33 +01:00
Chriztian Steinmeier
b876771a75
Minor edits to the XPath query help sheet ( #11385 )
...
* Clarify the use of placeholders
Since the placeholder is only replaced if it's at the beginning of the query, I've added a note about it.
Also made the spelling of XPath consistent and fixed a nesting error in the HTML.
* Rephrase a couple of sentences
(cherry picked from commit e04efe6067
2021-11-03 17:03:14 +01:00
Paul Seal
9a6a7ffa88
Added more detailed message when deleting items in the list view ( #11375 )
...
* Added more detailed message when deleting items in the list view
* Update FR language file
(cherry picked from commit 14fe7d99a8
2021-11-03 17:03:14 +01:00
Matthew Care
c7b285796d
Update background size
...
Update background size property to `contain` so that the whole image shows
(cherry picked from commit 215ef3d7b6
2021-11-03 17:03:14 +01:00
Chriztian Steinmeier
f1668c6bd7
Add positioning context
...
A fallback for browsers that don't support `contain: content`, to make sure the positioning context is correct
(cherry picked from commit 8989c4ad13
2021-11-03 17:03:14 +01:00
Matthew Care
4a4b45fe27
Link insertion with no selected text
...
TinyMCE requires text to be selected in order to insert links.
Added checks for if there is a text selection, and insert HTML content if there is not.
Link contents consists of the target name, or the target url if not populated
(cherry picked from commit e7f8e692c2
2021-11-03 17:03:14 +01:00
Patrick de Mooij
f39909dd90
8258: Added create dictionary item button
...
(cherry picked from commit 49132e2b7f
2021-11-03 17:03:14 +01:00
Sebastiaan Janssen
64dc1d4862
Gets all of the remaining changes to Cypress tests from v9 dev - all tests pass on v8
2021-11-03 17:03:14 +01:00
Nikolaj Geisle
a3797aaeef
v9: Fixing flaky cypress test "Macro in Grid" ( #11485 )
...
* 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
2021-11-03 17:03:14 +01:00
Nikolaj Geisle
0bd82d33aa
v9: Update cypress to newest version and fix errors ( #11486 )
...
* 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
2021-11-03 17:03:14 +01:00
Jesper Mayntzhusen
ac83a32d34
add delete language test ( #11380 )
...
(cherry picked from commit ba73a39558
2021-11-03 17:03:14 +01:00
Jesper Mayntzhusen
771dfdb48f
Cypress test for textbox max length ( #11245 )
...
* add test for textbox max length
* remove leftover comment
Co-authored-by: Jesper <jmh@umbraco.dk >
(cherry picked from commit f29bda6455
2021-11-03 17:03:14 +01:00
Jesper Mayntzhusen
f555f0adfe
add cypress test for deleting a user ( #11282 )
...
(cherry picked from commit a2f05850c0
2021-11-03 17:03:14 +01:00
Sebastiaan Janssen
eee8bd5565
Fixed missing null check in BlockEditorPropertyEditor ( #11184 )
...
Thanks @lauraneto - reviewed this and your fix solves the issue. #h5yr
(cherry picked from commit 23d2106277
2021-11-03 17:03:14 +01:00
Bjarke Berg
3b73a87a68
Bumped right info :'(
2021-11-03 15:26:39 +01:00
Bjarke Berg
b4d00cc695
Bump version to 9.1.0-rc
2021-11-03 15:05:12 +01:00
Bjarke Berg
7f061bd818
Merge pull request #11570 from umbraco/v9/feature/merge_v9_contrib_03-11-2021
...
V9: Merge `v9/contrib` 03-11-2021
2021-11-03 14:54:59 +01:00
Bjarke Berg
be65f12ed7
Updated nuget dependencies
2021-11-03 14:29:59 +01:00
Bjarke Berg
1af1506b67
Merge pull request #11524 from umbraco/v9/bugfix/dont-reload-page-with-edit-user-button
...
v9: don't reload page when navigating to edit user
2021-11-03 14:22:25 +01:00
Nikolaj Geisle
439e1b5596
Updated User after merge
2021-11-03 14:15:36 +01:00
Nikolaj Geisle
a54a76e113
Merge branch 'v9/dev' into v9/bugfix/dont-reload-page-with-edit-user-button
...
# Conflicts:
# src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
2021-11-03 14:14:07 +01:00
Bjarke Berg
67604654c1
Fixed breaking changes
2021-11-03 14:03:28 +01:00
Sebastiaan Janssen
692f952293
Merge branch 'v9/contrib' into v9/dev
...
# Conflicts:
# src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
2021-11-03 13:05:43 +01:00
Bjarke Berg
353686361b
Merge branch 'v9/9.0' into v9/dev
2021-11-03 13:01:52 +01:00
Bjarke Berg
109487f117
Merge pull request #11568 from umbraco/v9/feature/merge_v8_03-11-2021
...
V9: Merge v8: 03-11-2021
2021-11-03 12:56:23 +01:00
Bjarke Berg
f694a09a0c
Merge pull request #11562 from umbraco/v9/feature/merge_and_clean_history_cleanup
...
V9: Merged History cleanup from v8 and refactored to v9
2021-11-03 12:35:14 +01:00
Bjarke Berg
a91d708bc5
cleanup
2021-11-03 12:11:05 +01:00
Bjarke Berg
fb953ad532
Only run this test on windows
2021-11-03 12:10:42 +01:00
Elitsa Marinovska
53a83abf1a
Fix lang files
2021-11-03 11:25:38 +01:00
Elitsa Marinovska
236bf88143
Cleanup
2021-11-03 10:23:50 +01:00
Bjarke Berg
ab96e7c17d
fix for linux+mac
2021-11-03 09:11:30 +01:00
Bjarke Berg
c3ebbe23fd
Merge remote-tracking branch 'origin/v8/dev' into v9/feature/merge_v8_03-11-2021
...
# Conflicts:
# src/Umbraco.Core/Configuration/GlobalSettings.cs
# src/Umbraco.Core/Configuration/IGlobalSettings.cs
# src/Umbraco.Core/Constants-AppSettings.cs
# src/Umbraco.Tests/Umbraco.Tests.csproj
# src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
# 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/Editors/ContentTypeController.cs
# src/Umbraco.Web/HealthCheck/Checks/Security/BaseHttpHeaderCheck.cs
# tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configurations/LanguageXmlTests.cs
2021-11-03 08:44:12 +01:00
Berg
a25183a063
Committing missing package-lock.json
2021-11-02 16:22:35 +01:00
Berg
4882837d60
Fixed test
2021-11-02 16:18:49 +01:00
Bjarke Berg
ef34fe5a8a
Missing lock file
2021-11-02 14:25:42 +01:00
Bjarke Berg
d18afd351e
Merge remote-tracking branch 'origin/v8/feature/version-history-cleanup-ui' into v9/feature/merge_and_clean_history_cleanup
...
# Conflicts:
# tests/Umbraco.Tests.AcceptanceTest/package.json
2021-11-02 14:08:44 +01:00
Bjarke Berg
8e49b91692
Updated cyoress + testhelpers
2021-11-02 14:07:56 +01:00
Bjarke Berg
89aa7f87bd
Updated cypress + testhelpers
2021-11-02 13:29:47 +01:00
Sebastiaan Janssen
bb323b0286
Merge branch 'v8/dev' into v8/contrib
2021-11-02 13:29:33 +01:00
Niels Lyngsø
f68dba7bcb
Additional optional sanitization of scripting in TinyMCE ( #10653 )
2021-11-02 13:21:44 +01:00
Bjarke Berg
a1f93f84e2
changed default values
2021-11-02 11:59:34 +01:00
Bjarke Berg
bf7e356e34
Merge remote-tracking branch 'origin/v8/feature/version-history-cleanup-ui' into v9/feature/merge_and_clean_history_cleanup
...
# Conflicts:
# src/Umbraco.Core/Models/ContentEditing/HistoryCleanup.cs
# tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentVersionCleanupServiceTest.cs
2021-11-02 10:59:09 +01:00
Bjarke Berg
456b8a8a7c
Fixed test now that save of content types creates a cleanup policy
2021-11-02 10:58:16 +01:00
Bjarke Berg
ab06d21639
Fix namespace syntax
2021-11-02 10:42:51 +01:00
Bjarke Berg
0c3c88609e
New projects starts with history cleanup enabled by default
2021-11-02 10:19:41 +01:00
Bjarke Berg
08c283656e
aligned background job timings with v8 version
2021-11-02 10:17:36 +01:00
Bjarke Berg
6c628a46ba
Merge remote-tracking branch 'origin/v8/feature/version-history-cleanup-ui' into v9/feature/merge_and_clean_history_cleanup
...
# Conflicts:
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentTypeRepository.cs
2021-11-02 09:45:45 +01:00
