Skip to content

Add text restore after restore icon - #19435

Merged
rullzer merged 1 commit into
masterfrom
fix/deleted_shares
Feb 13, 2020
Merged

Add text restore after restore icon#19435
rullzer merged 1 commit into
masterfrom
fix/deleted_shares

Conversation

@GretaD

@GretaDGretaD commented Feb 12, 2020•
edited
Loading

Copy link
Copy Markdown
Contributor

Deleted files have text "Restore" after the restore icon. We should have it also for deleted shares

rullzer
rullzer reviewed Feb 12, 2020
View reviewed changes
Comment threadapps/files_sharing/js/app.js Outdated
@GretaD
GretaD requested a review from rullzerFebruary 12, 2020 15:18
@juliusknorr

juliusknorr commented Feb 12, 2020

Copy link
Copy Markdown
Member

Bundles also need an update 😉

Uncommited changes in webpack build
HEAD detached at pull/19435/merge
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: apps/files_sharing/js/dist/files_sharing.js
modified: apps/files_sharing/js/dist/files_sharing.js.map
no changes added to commit (use "git add" and/or "git commit -a")

@juliusknorrjuliusknorr added this to the Nextcloud 19 milestone Feb 12, 2020
@juliusknorrjuliusknorr added 2. developing Work in progress bug labels Feb 12, 2020
@GretaD
GretaDforce-pushed the fix/deleted_shares branch 3 times, most recently from 8581cd3 to a98a4b2CompareFebruary 12, 2020 17:25
@rullzer

rullzer commented Feb 12, 2020

Copy link
Copy Markdown
Member

/compile amend /

@GretaD@npmbuildbot
Add text restore after restore icon
0f07e66
Signed-off-by: GretaD <gretadoci@gmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
@rullzerrullzer added 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress labels Feb 13, 2020
@rullzer
rullzer merged commit f397866 into masterFeb 13, 2020
@rullzer
rullzer deleted the fix/deleted_shares branch February 13, 2020 08:22
@rullzer

rullzer commented Feb 13, 2020

Copy link
Copy Markdown
Member

/backport to stable18

@rullzer

rullzer commented Feb 13, 2020

Copy link
Copy Markdown
Member

/backport to stable17

@backportbot-nextcloud

backportbot-nextcloudBot commented Feb 13, 2020

Copy link
Copy Markdown

The backport to stable18 failed. Please do this backport manually.

@backportbot-nextcloud

backportbot-nextcloudBot commented Feb 13, 2020

Copy link
Copy Markdown

The backport to stable17 failed. Please do this backport manually.

@juliusknorr

juliusknorr commented Mar 3, 2020

Copy link
Copy Markdown
Member

@GretaD Mind to backport this manually?

@skjnldsv

skjnldsv commented Apr 10, 2020

Copy link
Copy Markdown
Member

/backport to stable18

@skjnldsv

skjnldsv commented Apr 10, 2020

Copy link
Copy Markdown
Member

/backport to stable17

@backportbot-nextcloudbackportbot-nextcloudBot mentioned this pull request Apr 10, 2020
Merged
@backportbot-nextcloud

backportbot-nextcloudBot commented Apr 10, 2020

Copy link
Copy Markdown

backport to stable18 in #20407 with conflicts ⚠️

@backportbot-nextcloudbackportbot-nextcloudBot mentioned this pull request Apr 10, 2020
Merged
@backportbot-nextcloud

backportbot-nextcloudBot commented Apr 10, 2020

Copy link
Copy Markdown

backport to stable17 in #20408 with conflicts ⚠️

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

Reviewers

@rullzerrullzerrullzer approved these changes
@juliusknorrjuliusknorrjuliusknorr approved these changes

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finishbug

Projects

None yet

Milestone

Nextcloud 19

Development

Successfully merging this pull request may close these issues.

4 participants

@GretaD@juliusknorr@rullzer@skjnldsv