Skip to content

Commit a7ebc52

Browse files
Merge branch 'master' into feat/people-menu
Address remaining review feedback: document why the avatar trigger clears NcHeaderMenu's icon mask, and wait for the icon assertion in the preview-avatars unit test. Rebuild assets after merging master. Assisted-by: Cursor:Composer Co-authored-by: Cursor <cursoragent@cursor.com>
2 parents 9fbdb48 + 08ad43d commit a7ebc52

1,365 files changed

Lines changed: 12325 additions & 14081 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/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/__mocks__ @nextcloud/server-frontend
1111
/__tests__ @nextcloud/server-frontend
1212
/dist @nextcloud/server-frontend
13-
/cypress @nextcloud/server-frontend
13+
/tests/playwright @nextcloud/server-frontend
1414
**/css @nextcloud/server-frontend
1515
**/js @nextcloud/server-frontend
1616
**/src @nextcloud/server-frontend

.github/workflows/cypress.yml

Lines changed: 0 additions & 269 deletions
This file was deleted.

.github/workflows/npm-build.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,11 @@ jobs:
7575
- name: Set up npm ${{ steps.versions.outputs.npmVersion }}
7676
run: npm i -g 'npm@${{ steps.versions.outputs.npmVersion }}'
7777

78-
# This does not work on server as we have some git dependencies that "npm-package-lock-add-resolved" cannot handle
79-
# - name: Validate package-lock.json # See https://github.com/npm/cli/issues/4460
80-
# run: |
81-
# npm i -g npm-package-lock-add-resolved@1.1.4
82-
# npm-package-lock-add-resolved
83-
# git --no-pager diff --exit-code
78+
- name: Validate package-lock.json # See https://github.com/npm/cli/issues/4460
79+
run: |
80+
npm i -g npm-package-lock-add-resolved@1.1.4
81+
npm-package-lock-add-resolved
82+
git --no-pager diff --exit-code
8483
8584
- name: Install dependencies & build
8685
env:

.github/workflows/playwright.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ jobs:
8282
strategy:
8383
fail-fast: false
8484
matrix:
85-
shardIndex: [1, 2, 3, 4, 5, 6, 7]
86-
shardTotal: [7]
85+
shardIndex: [1, 2, 3, 4, 5, 6, 7, 8]
86+
shardTotal: [8]
8787
outputs:
8888
node-version: ${{ steps.versions.outputs.node-version }}
8989
package-manager-version: ${{ steps.versions.outputs.package-manager-version }}

.gitignore

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,7 @@ composer.phar
179179
./.htaccess
180180
core/js/mimetypelist.js
181181

182-
# Tests - cypress
183-
cypress/downloads
184-
cypress/snapshots
185-
cypress/videos
182+
# Tests - Legacy cypress (to not clobber the directory when changing branches)
183+
/cypress
186184

187185
/.direnv

.nextcloudignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ codecov.yml
3636
cs-fixer
3737
csfixer
3838
custom.d.ts
39-
cypress
40-
cypress.config.ts
4139
eslint.config.js
4240
flake.lock
4341
flake.nix

0 commit comments

Comments
 (0)