Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[next] chore(master): merge master into next #5177

Merged
merged 15 commits into from
Jan 29, 2024

Conversation

raimund-schluessler
Copy link
Contributor

☑️ Resolves

  • Merges master into next.

#4953 had some conflicts, so here is the manual merge / backport.

Antreesy and others added 15 commits November 30, 2023 12:20
…of default

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
By default Vue-Select takes width for content list on element insert.
But if select is resized after opening (for example, on page scale), that width is not actual anymore.
Manually set width according to the toggle element on update.

Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
…h-on-scaling

fix(NcSelect): list width on page scaling
Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
Signed-off-by: Eduardo Morales <emoral435@gmail.com>
…tcloud-vite-config-to-1.2.1

chore(deps): bump nextcloud-vite-config library from 1.2.0 to 1.2.1
Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
…prop-NcColorPicker

fix(`NcColorPicker`): define a container prop
…-icon-slot

feat(NcNoteCard): provide a slot for inserting a custom icon instead of default
Signed-off-by: Christopher Ng <chrng8@gmail.com>
…log-8.5.1

chore: Fix missing PR from changelog
…ossible-to-close-left-sidebar-on-small-screens

fix: app-navigation-toggle remains on screen on small viewports
…--integrate-with-current-focus-trap

fix(NcActions): intercept into current focus trap stack
@raimund-schluessler raimund-schluessler added 3. to review Waiting for reviews vue 3 Related to the vue 3 migration labels Jan 29, 2024
@raimund-schluessler raimund-schluessler added this to the 9.0.0-alpha.1 milestone Jan 29, 2024
@raimund-schluessler raimund-schluessler merged commit 0ab9b58 into next Jan 29, 2024
15 checks passed
@raimund-schluessler raimund-schluessler deleted the chore/noid/merge-master-next branch January 29, 2024 18:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews vue 3 Related to the vue 3 migration
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants