Skip to content

Clarify "Delete share" action in sharing sidebar #18563

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
Merged
skjnldsv merged 3 commits into from
Dec 28, 2019
Merged

Clarify "Delete share" action in sharing sidebar #18563

skjnldsv merged 3 commits into from
Dec 28, 2019

Conversation

@alexandregv
Copy link
Member

@alexandregv alexandregv commented Dec 25, 2019 •
edited
Loading

As requested in #18477 (originally #18202), this PR:

  • changes "Delete share" to "Unshare"
  • changes icon-delete to icon-close

Fixes: #18477

Signed-off-by: Alexandre Guiot--Valentin [email protected]

@alexandregv
Clarify "Delete share" action in sharing sidebar
d8ba5e5 
- change "Delete share" to "Unshare"
- change icon-delete to icon-close

Signed-off-by: Alexandre Guiot--Valentin <[email protected]>
@gary-kim gary-kim added 3. to review Waiting for reviews design Design, UI, UX, etc. enhancement feature: file sidebar Related to the file sidebar component feature: sharing labels Dec 25, 2019
@gary-kim gary-kim added this to the Nextcloud 18 milestone Dec 25, 2019
@gary-kim
Copy link
Member

gary-kim commented Dec 25, 2019 •
edited
Loading

/compile amend /

EDIT: Welp, this isn't working. I'll just do it myself.
EDIT 2: @alexandregev I just recompiled the files. I hope you don't mind?

@alexandregv @gary-kim
Commit webpack build files
dd81384 
Signed-off-by: Alexandre Guiot--Valentin <[email protected]>
Signed-off-by: Gary Kim <[email protected]>
gary-kim
gary-kim approved these changes Dec 25, 2019
View reviewed changes
Copy link
Member

@gary-kim gary-kim left a comment

Choose a reason for hiding this comment

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

Thank you for your contribution and welcome!

@alexandregv
Copy link
Member Author

alexandregv commented Dec 25, 2019 •
edited
Loading

No problem 🙂
I wasn't sure of what I had to include about webpack files haha

Thanks !

@skjnldsv
Copy link
Member

skjnldsv commented Dec 26, 2019

Hi @alexandregv! Thanks a lot!
Could you also change the others location for this?
You will probably also have it under here

server/apps/files_sharing/src/components/SharingEntry.vue

Line 124 in 176d8e8

icon="icon-delete"

server/apps/files_sharing/src/components/SharingEntryInherited.vue

Line 44 in aa46fc2

icon="icon-delete"

I think they were forgotten :)

@skjnldsv
Copy link
Member

skjnldsv commented Dec 26, 2019 •
edited
Loading

/compile amend /

Ah right, it doesn't work on forks.
skjnldsv/npmbuildbot#19

@gary-kim
Copy link
Member

gary-kim commented Dec 26, 2019

Oh, that's why it didn't work!

@alexandregv @gary-kim
Change icon-delete to icon-close in others locations
ab50fee 
Signed-off-by: Alexandre Guiot--Valentin <[email protected]>
Signed-off-by: Gary Kim <[email protected]>
@gary-kim gary-kim added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Dec 26, 2019
This was referenced Dec 27, 2019
Merged
Merged
@skjnldsv skjnldsv merged commit 88a24d7 into nextcloud:master Dec 28, 2019
@welcome
Copy link

welcome bot commented Dec 28, 2019

Thanks for your first pull request and welcome to the community! Feel free to keep them coming! If you are looking for issues to tackle then have a look at this selection: https://github.com/nextcloud/server/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22
Most developers hang out on IRC. So join #nextcloud-dev on Freenode for a chat!

@alexandregv alexandregv deleted the patch-1 branch December 28, 2019 10:52
jancborchardt
jancborchardt reviewed Dec 30, 2019
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.

Only saw it now, thanks a lot for fixing this detail @alexandregv – and welcome to Nextcloud! :)

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

Reviewers

@jancborchardt jancborchardt jancborchardt left review comments

@juliusknorr juliusknorr juliusknorr approved these changes

@skjnldsv skjnldsv skjnldsv approved these changes

@gary-kim gary-kim gary-kim approved these changes

Assignees

No one assigned

Labels

4. to release Ready to be released and/or waiting for tests to finish design Design, UI, UX, etc. enhancement feature: file sidebar Related to the file sidebar component feature: sharing

Projects

None yet

Milestone

Nextcloud 18.0.0

Development

Successfully merging this pull request may close these issues.

Use "Unshare" instead of "Delete share" for the sharing sidebar

5 participants

@alexandregv @gary-kim @skjnldsv @jancborchardt @juliusknorr