Skip to content

Release: merge development into beta #1357

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.

Sign up for GitHub

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

Merged
rubenvdlinde merged 5 commits into from
Aug 30, 2026
Merged

Release: merge development into beta #1357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5159d2b
fix(sidebar): render the manifest page's sidebar alongside our own (#…
rubenvdlinde Aug 30, 2026
ec4d40a
chore(deps): @conduction/nextcloud-vue 2.24.4, which supports pinia 4…
rubenvdlinde Aug 30, 2026
aa54aeb
chore(sync): carry beta back into development
github-actions[bot] Aug 30, 2026
a9c60d0
Merge pull request #1364 from ConductionNL/sync/beta-to-development-2…
rubenvdlinde Aug 30, 2026
ff6be62
style: run Prettier over the sidebar change (#1363)
rubenvdlinde Aug 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"extends @nextcloud/browserslist-config"
],
"dependencies": {
"@conduction/nextcloud-vue": "^2.24.2",
"@conduction/nextcloud-vue": "^2.24.4",
"@nextcloud/auth": "^2.6.0",
"@nextcloud/axios": "~2.5.2",
"@nextcloud/capabilities": "^1.2.1",
Expand Down
6 changes: 5 additions & 1 deletion src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
`objectSidebarState` when a detail page enables `config.sidebar`; this
slot renders the tabs. Mirrors the decidesk / procest shell pattern.
-->
<template #sidebar>
<template #sidebar="{ pageSidebarComponent }">
<CnObjectSidebar
v-if="objectSidebarState.active"
:title="objectSidebarState.title"
Expand All @@ -43,6 +43,10 @@
:registry="registry"
:open="objectSidebarState.open"
@update:open="objectSidebarState.open = $event" />
<!-- The manifest page's own sidebar (pages[].sidebarComponent). Passed in
as a slot prop because filling this slot suppresses CnAppRoot's
fallback, which is what hid the flow sidebar. -->
<component :is="pageSidebarComponent" v-if="pageSidebarComponent" />
</template>
</CnAppRoot>
</template>
Expand Down Expand Up @@ -178,7 +182,7 @@
*
* @param {string} key Translation key.
* @return {string} Translated string (or the key on miss).
* @spec exclude Shell glue — closes over @nextcloud/l10n translate so

Check warning on line 185 in src/App.vue

View workflow job for this annotation

GitHub Actions / lint-check 

Unexpected inline JSDoc tag. Did you mean to use {@nextcloud}, \@nextcloud, or `@nextcloud`?

Check warning on line 185 in src/App.vue

View workflow job for this annotation

GitHub Actions / quality / Vue Quality (eslint) 

Unexpected inline JSDoc tag. Did you mean to use {@nextcloud}, \@nextcloud, or `@nextcloud`?

Check warning on line 185 in src/App.vue

View workflow job for this annotation

GitHub Actions / quality / Vue Quality (eslint) 

Unexpected inline JSDoc tag. Did you mean to use {@nextcloud}, \@nextcloud, or `@nextcloud`?
* CnAppRoot need not know the app id; no app-specific behavior.
*/
translateForApp(key) {
Expand Down
Loading