diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-07 01:14:12 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-07 01:14:12 +0100 |
| commit | 23fc424b7aea139a0aff5cd347f46c81e50c2c56 (patch) | |
| tree | 47ce5106180cac5ebe93adaa4c91edc2c5ce8b79 /app/views | |
| parent | b835f4aa1ce12cc31a721750a857d8d08a50069a (diff) | |
Account notes (bios) can now contain links. Character limit upped to 160
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/accounts/_header.html.haml | 2 | ||||
| -rw-r--r-- | app/views/api/v1/accounts/show.rabl | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml index fb9abd691..ec2233b77 100644 --- a/app/views/accounts/_header.html.haml +++ b/app/views/accounts/_header.html.haml @@ -12,7 +12,7 @@ %small= "@#{@account.username}" .details .bio - %p= @account.note + .account__header__content= Formatter.instance.simplified_format(@account) .details-counters .counter{ class: active_nav_class(account_url(@account)) } diff --git a/app/views/api/v1/accounts/show.rabl b/app/views/api/v1/accounts/show.rabl index 0d9e268a1..623329059 100644 --- a/app/views/api/v1/accounts/show.rabl +++ b/app/views/api/v1/accounts/show.rabl @@ -1,7 +1,8 @@ object @account -attributes :id, :username, :acct, :display_name, :note +attributes :id, :username, :acct, :display_name +node(:note) { |account| Formatter.instance.simplified_format(account) } node(:url) { |account| TagManager.instance.url_for(account) } node(:avatar) { |account| full_asset_url(account.avatar.url(:large, false)) } node(:header) { |account| full_asset_url(account.header.url(:medium, false)) } |