David Yip dbb1fce94d Merge remote-tracking branch 'upstream/master' into gs-master

2017-10-16 09:23:59 -05:00

..

about

Merge upstream 2.0ish #165

2017-10-11 10:43:10 -07:00

accounts

Basic static metadata styling

2017-10-06 22:22:34 -07:00

admin

Fix #5351 - Redirection with page params after copy emoji (#5387)

2017-10-14 14:40:10 +02:00

admin_mailer

Make salutation of email localizable (#4454)

2017-07-31 00:18:44 +02:00

application

Added haml-lint and fix warnings (#2773)

2017-05-08 03:35:25 +02:00

auth

sign_in and sign_up views present og meta infos (#5308)

2017-10-11 00:52:25 +02:00

authorize_follows

Add "signed in as" header to some pages (#4523)

2017-08-05 04:24:58 +02:00

errors

New error page graphic. Other error page improvements (#5099)

2017-09-25 23:05:54 +02:00

follower_accounts

Add option to opt out of search engines on public profile/status pages (#4199)

2017-07-14 16:41:02 +02:00

following_accounts

Add option to opt out of search engines on public profile/status pages (#4199)

2017-07-14 16:41:02 +02:00

home

Merge remote-tracking branch 'upstream/master'

2017-10-11 21:27:17 +02:00

kaminari

…

layouts

Merge remote-tracking branch 'upstream/master'

2017-10-11 21:27:17 +02:00

notification_mailer

Make salutation of email localizable (#4454)

2017-07-31 00:18:44 +02:00

oauth

Oauth code in input form and add description message (#4986)

2017-09-17 15:23:44 +02:00

remote_follow

…

settings

Merge remote-tracking branch 'upstream/master' into gs-master

2017-10-16 09:23:59 -05:00

shared

fix presented og:url is incorrect (#5320)

2017-10-11 19:22:21 +02:00

shares

Add protocol handler. Handle follow intents (#4511)

2017-08-14 04:53:31 +02:00

stream_entries

Merge remote-tracking branch 'upstream/master' into gs-master

2017-10-16 09:23:59 -05:00

tags

Adjust public hashtag pages (#5357)

2017-10-14 14:48:12 +02:00

user_mailer

Fix stupid typo (#5184)

2017-10-02 23:27:52 +02:00

well_known

Send short account URL to remote instance (regression from #3844) (#4355)

2017-07-25 15:59:43 +02:00