Commit Graph

40687 Commits

Author SHA1 Message Date
Matt Darby
0a626c6c2a Replace .first() with localize (#11341)
Replaced usage of first() with localize to target specific action in context menu
2021-11-16 09:25:04 +10:00
Bjarke Berg
cabc30341a Merge pull request #11592 from rickbutterfield/feature/temp-11591
v9: Fix for OAuth ExternalLogin
2021-11-15 12:54:44 +01:00
Andy Butland
fe396ba0cf Inverted conditional on linking user for clarity. 2021-11-15 11:45:00 +01:00
Andy Butland
c6176a0ae7 Added null check for external login invocation when linking users. 2021-11-15 11:42:04 +01:00
Andy Butland
3d43815981 Added suggestions from code review. 2021-11-15 11:17:47 +01:00
Enkel Media
c59d799557 Update docs for localize.directive.js
Updated docs to add information about tokens and watch-tokens.
2021-11-15 09:14:35 +10:00
Jesper Mayntzhusen
ea9d6919a8 Cy create language (#11546)
* 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>
2021-11-14 02:20:17 +01:00
Nikolaj Geisle
837cef0b14 Update user test to use constants 2021-11-11 13:06:09 +01:00
Rick Butterfield
f92070cee9 v9: Health Check still references web.config instead of appsettings.json (#11600)
* Fix an old reference to web.config instead of appsettings.json

* Match en_us.xml to en.xml

* adding FR translations
2021-11-11 01:00:04 +01:00
Matthew Care
fe7b696c7c Add support for media saving messages in dropzone (#11304)
* WIP

Waiting for a response on the issue about how to proceed

* Support messages in dropzone

Update dropzone to allow the showing of messages that may be added in a media saving notification / handler

* Remove test code

Remove code used for testing

* Sort usings

Remove unused using

* Fix ordering

Ordering of files when they were being processed was backwards / out of order

* Add button to "okay" all messages

PR Feedback to add a button to dismiss all of the messages all at once.
Fixing a referencing issue with `currentFile`

Co-authored-by: Michael Latouche <michael@crossingpaths.be>
2021-11-10 02:32:21 +01:00
Lennard Fonteijn
570841b958 Allow appsettings.json to set SMTP authentication to string.Empty 2021-11-10 01:33:13 +01:00
Rick Butterfield
709c2498fe Remove unreachable code 2021-11-08 12:46:04 +00:00
Rick Butterfield
b00e686936 Fixes #11591 2021-11-08 12:44:01 +00:00
Rick Butterfield
1117440a04 Fix for #11591 2021-11-06 11:40:05 +00:00
Nikolaj Geisle
ba7db3b842 v9: Use localization keys instead of hardcoded string (#11406)
* Update help.controller.js

* updated with better localization keys

* Added more translations

* Fixed spelling mistakes

* Updated help.controller.js according to review

* Fix localizaMany to include another call

* Cleanup

Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
2021-11-04 16:50:33 +01:00
Nikolaj Geisle
1359eb8f77 v9: Create new 'delete stylesheet' cypress test (#11528)
* Create new cypress test- delete stylesheet

* Cleanup

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
2021-11-04 16:49:21 +01:00
Nikolaj Geisle
d4682a9fff Move language test to the 'tests' folder (#11527) 2021-11-04 10:37:00 +01:00
Sebastiaan Janssen
6f214fc269 Update 01_bug_report.yml 2021-11-04 08:47:02 +01:00
Sebastiaan Janssen
65a1e5adbe Merge branch 'v8/dev' into v9/contrib 2021-11-03 17:57:44 +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
04d0348351 Merge branch 'v9/dev' into v9/contrib 2021-11-03 17:14:46 +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
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)

# Conflicts:
#	src/Umbraco.Web/PropertyEditors/BlockEditorPropertyEditor.cs
2021-11-03 17:03:14 +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