David Yip b28b405b97 Merge remote-tracking branch 'origin/master' into gs-master

2017-11-16 22:52:37 -06:00

..

about

Merge upstream 2.0ish #165

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

accounts

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

2017-11-16 22:52:37 -06:00

admin

Add moderator role and add pundit policies for admin actions (#5635)

2017-11-11 20:23:33 +01:00

admin_mailer

Make salutation of email localizable (#4454)

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

application

…

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

…

following_accounts

…

home

Merge tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5

2017-11-16 01:21:16 -06:00

kaminari

…

layouts

Merge tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5

2017-11-16 01:21:16 -06: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 'origin/master' into gs-master

2017-11-16 22:52:37 -06: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

l10n: PT-BR translation updated (#5681)

2017-11-14 11:07:38 +09:00

well_known

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

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