Skip to content

[stable35] feat: collaborative description editing - #8558

Merged
grnd-alt merged 11 commits into
stable35from
backport/8297/stable35
Oct 19, 2026
Merged

[stable35] feat: collaborative description editing#8558
grnd-alt merged 11 commits into
stable35from
backport/8297/stable35

Conversation

@backportbot

@backportbot backportbot Bot commented Oct 19, 2026 •
edited by grnd-alt
Loading

Copy link
Copy Markdown

Backport of #8297

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Review and verify the backported changes
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@grnd-alt @backportbot
feat: collaborative description editing
8273e84 
Signed-off-by: grnd-alt <git@belakkaf.net>
@grnd-alt @backportbot
feature(description): conflict dialog
3abdd9e 
Signed-off-by: grnd-alt <git@belakkaf.net>
@grnd-alt @backportbot
fix(description): render basic markdown editor correctly
7fe8e40 
Signed-off-by: grnd-alt <git@belakkaf.net>
@grnd-alt @backportbot
fix(description): show last saved date for description
d5c3613 
Signed-off-by: grnd-alt <git@belakkaf.net>
@grnd-alt @backportbot
fix(description): exclusively update description when saving from Text
a4bae8d 
Assisted-by: ClaudeCode:claude-opus-5-5
Signed-off-by: grnd-alt <git@belakkaf.net>
@grnd-alt @backportbot
fix(psalm): stub Text app classes used by the context provider
4191505 
Assisted-by: ClaudeCode:claude-sonnet-5-5
Signed-off-by: grnd-alt <git@belakkaf.net>
@grnd-alt @backportbot
fix(text): translate card lookup errors to Text context exceptions
7724cb8 
Assisted-by: ClaudeCode:claude-sonnet-5-5
Signed-off-by: grnd-alt <git@belakkaf.net>
@grnd-alt @backportbot
fix(text): register description listener only when Text is available
71f501d 
Assisted-by: ClaudeCode:claude-sonnet-5-5
Signed-off-by: grnd-alt <git@belakkaf.net>
@grnd-alt
grnd-alt force-pushed the backport/8297/stable35 branch from 35b5a65 to f01f813 Compare October 19, 2026 08:34
@grnd-alt
fix(cypress): wait for the text save request instead of the deck api …
80daf4d 
…save

Signed-off-by: grnd-alt <git@belakkaf.net>
@grnd-alt
grnd-alt force-pushed the backport/8297/stable35 branch from f01f813 to 80daf4d Compare October 19, 2026 08:36
@grnd-alt
grnd-alt marked this pull request as ready for review October 19, 2026 08:37
@github-actions

github-actions Bot commented Oct 19, 2026

Copy link
Copy Markdown
Contributor

🐢 Performance warning.
It looks like the query count of the integration tests increased with this PR.
Database query count is now 207965 was 198420 (+4.81%)
Please check your code again. If you added a new test this can be expected and the base value in tests/integration/base-query-count.txt can be increased.

@github-actions

github-actions Bot commented Oct 19, 2026

Copy link
Copy Markdown
Contributor

🐢 Performance warning.
It looks like the query count of the integration tests increased with this PR.
Database query count is now 208014 was 198420 (+4.83%)
Please check your code again. If you added a new test this can be expected and the base value in tests/integration/base-query-count.txt can be increased.

@grnd-alt
grnd-alt added this pull request to stack #8568 October 19, 2026 11:33
@grnd-alt
fix(description): use non-collaborative Text editor for cards without…
f097358 
… an id

Assisted-by: ClaudeCode:claude-sonnet-5-5
Signed-off-by: grnd-alt <git@belakkaf.net>
@grnd-alt
grnd-alt removed this pull request from stack #8568 October 19, 2026 13:55
@grnd-alt
Merge pull request #8567 from nextcloud/backport/8562/backport/8297/s…
577e84d 
…table35

[backport/8297/stable35] fix(description): use non-collaborative Text editor for cards without…
@grnd-alt
grnd-alt enabled auto-merge October 19, 2026 13:55
@github-actions

github-actions Bot commented Oct 19, 2026

Copy link
Copy Markdown
Contributor

🐢 Performance warning.
It looks like the query count of the integration tests increased with this PR.
Database query count is now 205940 was 198420 (+3.78%)
Please check your code again. If you added a new test this can be expected and the base value in tests/integration/base-query-count.txt can be increased.

@grnd-alt
grnd-alt merged commit df1b97b into stable35 Oct 19, 2026
43 checks passed
@grnd-alt
grnd-alt deleted the backport/8297/stable35 branch October 19, 2026 14:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@grnd-alt grnd-alt grnd-alt approved these changes
@max-nextcloud max-nextcloud Awaiting requested review from max-nextcloud
@luka-nextcloud luka-nextcloud Awaiting requested review from luka-nextcloud luka-nextcloud is a code owner

Assignees

@grnd-alt grnd-alt

Labels

3. to review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@grnd-alt