Skip to content

Commit 481ea54

Browse files
committed
Merge branch 'backport/2385/stable24' of github.com:nextcloud/text into backport/2385/stable24
2 parents f7f8c90 + 9f1b1be commit 481ea54

200 files changed

Lines changed: 990 additions & 877 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/phpunit.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,26 @@ name: PHPUnit
22

33
on:
44
pull_request:
5+
paths:
6+
- .github/workflows/phpunit.yml
7+
- appinfo/**
8+
- composer.*
9+
- lib/**
10+
- psalm.xml
11+
- templates/**
12+
- tests/**
513
push:
614
branches:
715
- master
816
- stable*
17+
paths:
18+
- .github/workflows/phpunit.yml
19+
- appinfo/**
20+
- composer.*
21+
- lib/**
22+
- psalm.xml
23+
- templates/**
24+
- tests/**
925

1026
env:
1127
APP_NAME: text

cypress/integration/images.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ const checkImage = (documentId, imageName, imageId, index) => {
8282
cy.log('Check the image is visible and well formed', { documentId, imageName, imageId, index, encodedName })
8383
return new Cypress.Promise((resolve, reject) => {
8484
cy.get('#editor [data-component="image-view"]')
85-
.filter('[data-src="text://image?imageFileName=' + encodedName + '"]')
85+
.filter('[data-src=".attachments.' + documentId + '/' + encodedName + '"]')
8686
.find('.image__view') // wait for load finish
8787
.within(($el) => {
8888
// keep track that we have created this image in the attachment dir

js/editor-rich.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/editor-rich.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/editor.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/editor.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/files-modal.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/files-modal.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/text-files.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/text-files.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)