Commit Graph

40639 Commits

Author SHA1 Message Date
Nikolaj Geisle
32d8e0bb96 v9: Fix tests on Linux (#11586)
* 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>
2021-11-15 14:20:10 +01:00
Bjarke Berg
169fc7c12f Merge pull request #11609 from umbraco/v9/bugfix/AB14726-fix-user-invite
Fix sending invite emails
2021-11-15 13:13:31 +01:00
Bjarke Berg
fc49c8ac4e Merge remote-tracking branch 'origin/v9/9.1' into v9/9.1 2021-11-15 13:00:49 +01:00
Andy Butland
3465bff6f3 Inverted conditional on linking user for clarity. 2021-11-15 12:59:43 +01:00
Andy Butland
0217bdc063 Added null check for external login invocation when linking users. 2021-11-15 12:59:34 +01:00
Andy Butland
808ba62b34 Added suggestions from code review. 2021-11-15 12:58:23 +01:00
Rick Butterfield
e5a5d1e5b2 Remove unreachable code 2021-11-15 12:58:15 +01:00
Rick Butterfield
cb15c2a413 Fixes #11591 2021-11-15 12:57:58 +01:00
Rick Butterfield
25e82ddc14 Fix for #11591 2021-11-15 12:56:09 +01:00
Bjarke Berg
caa49a1463 package-lock 2021-11-12 15:32:34 +01:00
Bjarke Berg
1862b81418 Unbreak 2021-11-12 15:32:13 +01:00
Patrick de Mooij
baaed139c3 Updated version to 9.1.0 2021-11-12 14:55:12 +01:00
Bjarke Berg
b0e39fe548 Merge branch 'v9/dev' into v9/9.1 2021-11-12 14:53:11 +01:00
Nikolaj Geisle
d66fde6056 Fix after cherry pick 2021-11-12 14:42:53 +01:00
Nikolaj Geisle
15fa9e1bc1 v9: Don't load all translation files (#11576)
* Update systemInformation.ts

* Added lazy loading

* Update systemInformation.ts

* Update systemInformation.ts

* Use CharArrays.ForwardSlash instead of hardcoded string

* Align braces

Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
2021-11-12 14:37:50 +01:00
Bjarke Berg
581934da00 Merge pull request #11608 from umbraco/v9/task/obsolete-unneeded-deploy-events
Obsoletes events added for local database initialization for Umbraco Cloud that are no longer required.
2021-11-12 07:47:12 +01:00
Elitsa Marinovska
b8cd731b0d Don't send null but fall back to the user's email in case SMPT settings are not configured in appsettings 2021-11-11 15:07:51 +01:00
Andy Butland
e634c818d0 Obsoletes events added for local database initialization for Umbraco Cloud that are no longer required. 2021-11-11 15:02:06 +01:00
Nikolaj Geisle
f5ea5df8f3 v9: Don't load all translation files (#11576)
* Update systemInformation.ts

* Added lazy loading

* Update systemInformation.ts

* Update systemInformation.ts

* Use CharArrays.ForwardSlash instead of hardcoded string

* Align braces

Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
2021-11-10 11:48:09 +01:00
Paul Johnson
cf38e3a97b Separate customizations for clarity 2021-11-09 19:40:20 +00:00
Bjarke Berg
17abf0474c Added unit tests for ContentVersionService (#11597)
* Added unit tests for ContentVersionService

* Clean up

* Fixed tests after using ConfigureMembers = true

* Fixed tests after using ConfigureMembers = true
2021-11-09 16:48:50 +00:00
Bjarke Berg
90c64a22c7 Merge pull request #11582 from umbraco/v9/bugfix/downgrade_cypress
v9: Downgrade cypress to 8.4.1
2021-11-05 09:50:36 +01:00
Nikolaj Geisle
07feb8f79b Downgraded cypress to 8.4.1 2021-11-05 09:10:37 +01:00
Nikolaj Geisle
fdd62d367b Merge pull request #11579 from umbraco/v9/bugfix/allow_map_filesd_as_default_BrowsableFileExtensions
Allow .map files as default browsable file extensions from the App_Pl…
2021-11-05 08:53:08 +01:00
Bjarke Berg
a528b9d5f4 Allow .map files as default browsable file extensions from the App_Plugins static file handler. 2021-11-04 20:58:02 +01:00
Nikolaj Geisle
cd596b444e v9: Implemented new routing tests (#11571)
* Implemented new routing tests

* Update package-lock.json

* Cleanup

* Updated routing to cleanup before and after tests

Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
2021-11-04 16:54:25 +01:00
Nikolaj Geisle
740c2e4b53 Update systemInformation.ts (#11572)
Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
2021-11-04 14:07:59 +01:00
Bjarke Berg
b8616426ee Merge remote-tracking branch 'origin/v8/dev' into v9/dev
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
#	src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
#	src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
#	src/Umbraco.Web.UI.Client/src/views/relationtypes/create.html
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
2021-11-04 12:43:16 +01:00
Bjarke Berg
fa96ba1e82 Bump version to 9.2.0-rc 2021-11-04 12:36:10 +01:00
Bjarke Berg
a64c58d68e Merge branch 'v9/9.1' into v9/dev 2021-11-04 12:34:21 +01:00
Bjarke Berg
7b98cc3c4d Merge pull request #11495 from umbraco/v8/feature/version-history-cleanup
Version history cleanup
2021-11-04 12:33:07 +01:00
Bjarke Berg
02dfb5af25 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/version-history-cleanup
# Conflicts:
#	src/Umbraco.Tests.AcceptanceTest/package.json
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
2021-11-04 11:40:11 +01:00
Bjarke Berg
b09619f638 Merge pull request #11561 from umbraco/v8/feature/version-history-cleanup-ui
V8: Added UI to configure history cleanup per doc type
2021-11-04 11:36:58 +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
2ec77a2fde Merge branch 'v8/contrib' into v8/dev 2021-11-03 17:53:51 +01:00
Jan Skovgaard
91a67cd3f0 Add missing fallback texts in various views (#11466) 2021-11-03 17:49:28 +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)

# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
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)

# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
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)

# Conflicts:
#	tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Tabs/tabs.ts
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)

# Conflicts:
#	src/Umbraco.Tests.AcceptanceTest/package.json
#	tests/Umbraco.Tests.AcceptanceTest/package-lock.json
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)

# Conflicts:
#	src/Umbraco.Tests.AcceptanceTest/cypress/integration/Users/users.ts
2021-11-03 17:03:14 +01:00