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.

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

Jump to bottom

[stable25] Allow settings navigation items with no route entry #36529

Merged
merged 4 commits into from
Feb 24, 2023
Merged

[stable25] Allow settings navigation items with no route entry #36529

merged 4 commits into from
Feb 24, 2023

Conversation

Pytal
Copy link
Member

@Pytal Pytal commented Feb 3, 2023

Summary

Backport #36508

Checklist

@Pytal Pytal added this to the Nextcloud 25.0.4 milestone Feb 3, 2023
@Pytal Pytal self-assigned this Feb 3, 2023
@Pytal Pytal mentioned this pull request Feb 3, 2023
Merged
4 tasks
@blizzz blizzz mentioned this pull request Feb 6, 2023
Merged
@blizzz
Copy link
Member

blizzz commented Feb 7, 2023

/rebase

@blizzz
Copy link
Member

blizzz commented Feb 9, 2023

moving to 25.0.5

@Pytal Pytal force-pushed the backport/36508/stable25 branch from 9ac25bc to 1e0ddec Compare February 9, 2023 19:02
nickvergessen
nickvergessen previously requested changes Feb 10, 2023
View reviewed changes
Copy link
Member

@nickvergessen nickvergessen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Has to wait for next friday after 25.0.4 is out

Pytal and others added 4 commits February 24, 2023 10:32
@Pytal
Allow settings navigation items with no route entry
08845f7 
Signed-off-by: Christopher Ng <[email protected]>
(cherry picked from commit 62b7bb7)
@Pytal
Allow zero occurences of route in XML schemas
f725eed 
- For xmllint

Signed-off-by: Christopher Ng <[email protected]>
(cherry picked from commit 70651c3)
@Pytal
Remove extraneous user status route entry
23ab3a3 
Signed-off-by: Christopher Ng <[email protected]>
(cherry picked from commit c610d0d)
@nickvergessen @Pytal
fix(appinfo): navigation type is optional
5e82a11 
Signed-off-by: Joas Schilling <[email protected]>
(cherry picked from commit bf7fe04)
@Pytal Pytal force-pushed the backport/36508/stable25 branch from 1e0ddec to 5e82a11 Compare February 24, 2023 18:33
@Pytal Pytal added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Feb 24, 2023
@Pytal Pytal merged commit ec1f165 into stable25 Feb 24, 2023
@Pytal Pytal deleted the backport/36508/stable25 branch February 24, 2023 20:28
@blizzz blizzz mentioned this pull request Mar 13, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@artonge artonge artonge approved these changes

@JuliaKirschenheuter JuliaKirschenheuter JuliaKirschenheuter approved these changes

@ArtificialOwl ArtificialOwl ArtificialOwl approved these changes

@nickvergessen nickvergessen nickvergessen left review comments

@ChristophWurst ChristophWurst Awaiting requested review from ChristophWurst

@skjnldsv skjnldsv Awaiting requested review from skjnldsv

Assignees

@Pytal Pytal

Labels
4. to release Ready to be released and/or waiting for tests to finish feature: settings feature: status
Projects
None yet
Milestone
Nextcloud 25.0.5
Development

Successfully merging this pull request may close these issues.
6 participants
@Pytal @blizzz @nickvergessen @ArtificialOwl @JuliaKirschenheuter @artonge