Skip to content

doc(occ): extend group:adduser and removeuser#14503

Merged
miaulalala merged 3 commits intomasterfrom
enh/occ-group-add-and-removeuser-multiple
Apr 26, 2026
Merged

doc(occ): extend group:adduser and removeuser#14503
miaulalala merged 3 commits intomasterfrom
enh/occ-group-add-and-removeuser-multiple

Conversation

@blizzz
Copy link
Copy Markdown
Member

@blizzz blizzz commented Apr 22, 2026

For and needs nextcloud/server#59271

@blizzz
doc(occ): extend group:adduser and removeuser
0552f5e 
related to the commits 155c7f7ee4f5b8ba033cdf0c1b2924454e85e469
and 9f96ba9014ec70e552a2a70d2178790d9503a84c on the server repo.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@skjnldsv
Copy link
Copy Markdown
Member

skjnldsv commented Apr 26, 2026

Rebase and solve conflicts please :)

@miaulalala
Copy link
Copy Markdown
Contributor

miaulalala commented Apr 26, 2026

@copilot resolve the merge conflicts in this pull request

@miaulalala
Merge branch 'master' into enh/occ-group-add-and-removeuser-multiple …
1ff8fe1 
…- resolve conflicts

Co-authored-by: miaulalala <7427347+miaulalala@users.noreply.github.com>
Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 26, 2026 •
edited
Loading

Rebase and solve conflicts please :)

Done — merged master into the branch and resolved the conflicts in admin_manual/occ_users.rst (commit 1ff8fe1). The new multi-user examples for group:adduser and group:removeuser are preserved alongside master's improved formatting.

@copilot resolve the merge conflicts in this pull request

Resolved — merged master into the branch (commit 1ff8fe1) and resolved the conflicts in admin_manual/occ_users.rst, combining master's updated formatting with the multi-user documentation added in this PR.

Copilot AI requested a review from miaulalala April 26, 2026 11:31
@miaulalala
Copy link
Copy Markdown
Contributor

miaulalala commented Apr 26, 2026

@copilot please rename group "beer" to group "milliways"

Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 26, 2026

@copilot please rename group "beer" to group "milliways"

Done — renamed "beer" to "milliways" in both the group:adduser and group:removeuser examples (commit 29505ff).

@miaulalala miaulalala merged commit fb42c6e into master Apr 26, 2026
22 checks passed
@miaulalala miaulalala deleted the enh/occ-group-add-and-removeuser-multiple branch April 26, 2026 15:45
@blizzz
Copy link
Copy Markdown
Member Author

blizzz commented Apr 27, 2026 •
edited
Loading

needs nextcloud/server#59271

server pr was not merged yet

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@miaulalala miaulalala miaulalala approved these changes

@skjnldsv skjnldsv skjnldsv approved these changes

Assignees

No one assigned

Labels

3. to review enhancement manual: admin waiting for code merge

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@blizzz @skjnldsv @miaulalala