Make "unfollow" undo pending outgoing follow request too (#4781)

* Make "unfollow" undo pending outgoing follow request too

* Add cancel button to web UI when awaiting follow request approval

* Make the hourglass button do the cancelling
This commit is contained in:
Eugen Rochko
2017-09-02 20:44:41 +02:00
committed by GitHub
parent 2a5d1d5a1b
commit d3b6746173
8 changed files with 37 additions and 11 deletions

View File

@ -436,7 +436,7 @@
"id": "account.follow"
},
{
"defaultMessage": "Awaiting approval",
"defaultMessage": "Awaiting approval. Click to cancel follow request",
"id": "account.requested"
},
{

View File

@ -12,7 +12,7 @@
"account.mute": "Mute @{name}",
"account.posts": "Posts",
"account.report": "Report @{name}",
"account.requested": "Awaiting approval",
"account.requested": "Awaiting approval. Click to cancel follow request",
"account.share": "Share @{name}'s profile",
"account.unblock": "Unblock @{name}",
"account.unblock_domain": "Unhide {domain}",