Merge branch 'favorites' into 'develop'

Add Favorites TL to user profile, add some initial support for MastoAPI

Closes #265 and #262

See merge request pleroma/pleroma-fe!462
This commit is contained in:
HJ 2019-01-22 17:46:08 +00:00
commit 3a3cf1d48a
19 changed files with 2361 additions and 252 deletions

View file

@ -324,6 +324,7 @@
"block": "Block",
"blocked": "Blocked!",
"deny": "Deny",
"favorites": "Favorites",
"follow": "Follow",
"follow_sent": "Request sent!",
"follow_progress": "Requesting…",

View file

@ -279,6 +279,7 @@
"user_card": {
"block": "Заблокировать",
"blocked": "Заблокирован",
"favorites": "Понравившиеся",
"follow": "Читать",
"follow_sent": "Запрос отправлен!",
"follow_progress": "Запрашиваем…",