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

More comprehensive wording for devices wipe action #40161

Merged
merged 1 commit into from Mar 16, 2024
Merged

More comprehensive wording for devices wipe action #40161

merged 1 commit into from Mar 16, 2024

Conversation

Jerome-Herbinet
Copy link
Member

Respawn of #38882

Replace "Wipe all devices" wording with a more understandable one.

Checklist

@Jerome-Herbinet Jerome-Herbinet mentioned this pull request Aug 30, 2023
Closed
4 tasks
@szaimen szaimen added this to the Nextcloud 28 milestone Aug 30, 2023
jancborchardt
jancborchardt approved these changes Aug 30, 2023
View reviewed changes
Copy link
Member

@jancborchardt jancborchardt left a comment

Choose a reason for hiding this comment

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

Looks good!

@joshtrichards joshtrichards mentioned this pull request Sep 6, 2023
Open
@joshtrichards joshtrichards mentioned this pull request Oct 17, 2023
Open
@skjnldsv skjnldsv mentioned this pull request Nov 1, 2023
Merged
This was referenced Nov 6, 2023
Merged
Merged
jospoortvliet
jospoortvliet approved these changes Nov 14, 2023
View reviewed changes
Copy link
Member

@jospoortvliet jospoortvliet left a comment

Choose a reason for hiding this comment

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

Looks good to me!!!

@jospoortvliet
Copy link
Member

what needs to be done to get this in?

@blizzz blizzz mentioned this pull request Nov 14, 2023
Merged
@Jerome-Herbinet
Copy link
Member Author

Should I do a branch rebase and then a npm run build which could resolve the conflict ?

@blizzz blizzz mentioned this pull request Nov 20, 2023
Merged
5 tasks
@blizzz blizzz modified the milestones: Nextcloud 28, Nextcloud 29 Nov 23, 2023
@skjnldsv
Copy link
Member

Please rebase and drop dist changes :)

@skjnldsv skjnldsv added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Feb 23, 2024
@Jerome-Herbinet Jerome-Herbinet force-pushed the Jerome-Herbinet-better-devices-wipe-action-wording branch from 13948d3 to 341c982 Compare February 29, 2024 14:25
@Jerome-Herbinet Jerome-Herbinet force-pushed the Jerome-Herbinet-better-devices-wipe-action-wording branch from 341c982 to e485722 Compare February 29, 2024 14:27
@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress labels Feb 29, 2024
@skjnldsv

This comment was marked as resolved.

Sign in to view
@Jerome-Herbinet Jerome-Herbinet force-pushed the Jerome-Herbinet-better-devices-wipe-action-wording branch from e485722 to 9936e23 Compare February 29, 2024 14:30
@skjnldsv skjnldsv force-pushed the Jerome-Herbinet-better-devices-wipe-action-wording branch from 9936e23 to e5112b1 Compare February 29, 2024 14:32
@skjnldsv
Copy link
Member

Alright, let's go!

@skjnldsv skjnldsv force-pushed the Jerome-Herbinet-better-devices-wipe-action-wording branch from e5112b1 to cdc2f6f Compare March 1, 2024 10:07
@Jerome-Herbinet Jerome-Herbinet force-pushed the Jerome-Herbinet-better-devices-wipe-action-wording branch from cdc2f6f to 00cb692 Compare March 1, 2024 15:50
@Altahrim Altahrim mentioned this pull request Mar 12, 2024
Merged
@Altahrim
Copy link
Collaborator

@Jerome-Herbinet Can you fix the DCO and rebuild?

@Altahrim Altahrim mentioned this pull request Mar 14, 2024
Merged
@Jerome-Herbinet @skjnldsv
fix: more comprehensive wording for devices wipe action
c97d635 
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
@skjnldsv skjnldsv force-pushed the Jerome-Herbinet-better-devices-wipe-action-wording branch from 00cb692 to c97d635 Compare March 16, 2024 12:18
@skjnldsv skjnldsv merged commit 2c29d0e into master Mar 16, 2024
18 of 20 checks passed
@skjnldsv skjnldsv deleted the Jerome-Herbinet-better-devices-wipe-action-wording branch March 16, 2024 12:19
@Altahrim Altahrim mentioned this pull request Mar 18, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jospoortvliet jospoortvliet jospoortvliet approved these changes

@jancborchardt jancborchardt jancborchardt approved these changes

@skjnldsv skjnldsv skjnldsv approved these changes

@marcoambrosini marcoambrosini marcoambrosini approved these changes

@szaimen szaimen szaimen approved these changes

@Fenn-CS Fenn-CS Awaiting requested review from Fenn-CS

@Pytal Pytal Awaiting requested review from Pytal

@nimishavijay nimishavijay Awaiting requested review from nimishavijay

Assignees
No one assigned
Labels
4. to release Ready to be released and/or waiting for tests to finish feature: language l10n and translations feature: users and groups
Projects
None yet
Milestone
Nextcloud 29
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@Jerome-Herbinet @jospoortvliet @skjnldsv @Altahrim @jancborchardt @marcoambrosini @szaimen @joshtrichards @blizzz