Commit Graph

35580 Commits

Author SHA1 Message Date
Paul Johnson
bdbc38e280 Bugfix - Missing write lock 2021-11-16 10:13:20 +00:00
Paul Johnson
cf9a6671a9 Bugfix - DocumentVersionRepository.Get should not join culture variation 2021-11-16 08:53:44 +00:00
Paul Johnson
d89725bd48 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>
2021-11-16 08:24:12 +01:00
Sebastiaan Janssen
1fbf02d61e Merge branch 'v8/dev' into v8/contrib 2021-11-09 11:04:38 +01:00
Sebastiaan Janssen
e59f855aa9 Merge branch 'v8/contrib' of https://github.com/umbraco/Umbraco-CMS into v8/contrib 2021-11-09 11:04:01 +01:00
Sebastiaan Janssen
2aad2087a5 Merge branch 'v8/8.17' into v8/dev
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/contenttypehelper.service.js
2021-11-09 11:02:21 +01:00
Ronald Barendse
2993c301f3 Hide localization key while loading 2021-11-08 23:42:06 +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
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
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
Sebastiaan Janssen
5123799e32 Bump version to 8.17.1 2021-11-03 14:59:00 +01:00
Niels Lyngsø
23ce69db2f Additional optional sanitization of scripting in TinyMCE (#10653)
(cherry picked from commit f68dba7bcb)
2021-11-03 08:55:59 +01:00
Nikolaj Geisle
da48f8435a Merge pull request #11360 from umbraco/v8/bugfix/11057-mandatory-image-not-validating-after-first-time-failure
Fixes 11057: Mandatory Image not validating after first time failure

(cherry picked from commit 5cc70d2160)
2021-11-03 08:52:24 +01:00
Bjarke Berg
8e49b91692 Updated cyoress + testhelpers 2021-11-02 14:07:56 +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
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
b15f86c1c2 Fixed issue with history cleanup not persisted on first save 2021-11-02 09:45:20 +01:00
Bjarke Berg
c7e9e94996 cleanup 2021-11-02 09:25:21 +01:00
Bjarke Berg
c3279f71c1 Negated bool check.. 2021-11-02 09:18:03 +01:00
Callum Whyte
bd23a5fd2d Making UmbracoTreeSearcherFields virtual for easier overriding 2021-11-01 17:33:33 +01:00
Claus
1553f02b18 adding unit test for validating language xml files. (#7174)
* adding unit test for validating language xml files.

* locating the language files by traversing instead of hardcoded path.

* debugging null refs.

* debugging

* Updated method of detecting language folder for XML tests, that should work correctly on the build server.

* Path amends to support running test on build server.

* Path amends to support running test on build server (2).

Co-authored-by: Andy Butland <abutland73@gmail.com>
2021-11-01 14:50:54 +00:00
Anders Bjerner
152956bb1a Added ngdocs documentation for overlay.service.js 2021-10-31 12:16:27 +01:00
Anders Bjerner
7e55c469e3 Added extra selector for styling <code> elements in the content 2021-10-31 03:24:17 +01:00
Jan Skovgaard
d70583f238 Media Grid View improvements (#11518)
* Add last Updated text under general

* Map missing fallback text values and refactor <i> to <umb-icon> directive

* fix icon styling
2021-10-29 19:44:05 +02:00
Ibrahim Muhammad Nada
a20915664d GitHub issue#11299 fix v8 (#11493)
* adding validation

* adding localization keys

* applying cleaning up notes

* fix spaces

* revert ex.xml

* spaces again

* keep it DRY

* chenge hasTabsAndFirstRender to hasTabsOrFirstRender

Co-authored-by: inada <inada@2p.com.sa>
2021-10-29 18:06:00 +02:00
Martin Bentancour
56e05988f4 Validate fileName to prevent path traversal 2021-10-29 17:46:12 +02:00
Jeavon Leopold
c3625aed87 Fix the basehttpheader so that it's checking the root of the domain instead of /umbraco 2021-10-29 16:06:22 +02:00
Bjarke Berg
82a64ca589 Add message if prevent cleanup is globally disabled. 2021-10-29 14:51:38 +02:00
Bjarke Berg
b0ff096a8a Fixed Tests 2021-10-29 13:58:50 +02:00
Bjarke Berg
698e6b1533 Renamed interface to prepare for adding GetPagedRollbackVersions 2021-10-29 10:55:47 +02:00
Bjarke Berg
b96ec5a320 UI+Persistence for history cleanup per doc type 2021-10-28 14:14:07 +02:00
Bjarke Berg
ae20c49590 Do paging in database, when viewing rollbacks 2021-10-28 10:02:04 +02:00
Bjarne Fyrstenborg
b04609880b Accept udt as extension in import document type (#11108)
* Pass in invalid files

* Fix pattern and accept udt file extension

* Remove wildcard

* fix help text - referred to 'browse' button, which does not exist

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
2021-10-27 12:05:08 +10:00