You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Eugen Rochko b440b2a9ee
Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
8 years ago
..
about Clean up about page (#1282) 8 years ago
accounts Pagination improvements (#1445) 8 years ago
activitypub Add AS2 format to RABL files 8 years ago
admin Pagination improvements (#1445) 8 years ago
api When avatar/header are GIF, generate static versions (#1428) 8 years ago
auth Split 2FA login into two prompts 8 years ago
authorize_follow simplify emojification on public pages with .emojify class 8 years ago
errors Catching rack timeout from rails doesn't work 8 years ago
home Allow user to disable the boost confirm dialog in preferences 8 years ago
kaminari Pagination improvements (#1445) 8 years ago
layouts Use Setting.site_title value for `og:site_name` occurrences (#1194) 8 years ago
notification_mailer Add digest e-mails 8 years ago
oauth Allow setting of default language through config 8 years ago
remote_follow Adding remote follow button 8 years ago
settings Allow user to disable the boost confirm dialog in preferences 8 years ago
shared Fix issue with missing emojify class in views (#1455) 8 years ago
stream_entries Fix issue with missing emojify class in views (#1455) 8 years ago
tags Pagination improvements (#1445) 8 years ago
user_mailer French translation update (#1271) 8 years ago
xrd Add ability to use remote follow function on other sites 8 years ago