David Yip 1ab12ba38e Merge remote-tracking branch 'origin/master' into merge-upstream

2017-11-17 17:40:00 -06:00

..

activitypub

Fix HTTP responses for salmon and ActivityPub inbox processing (#5200)

2017-10-03 23:21:19 +02:00

admin

Fix regression #5467: fixes emoji copy (#5739)

2017-11-17 18:22:31 +01:00

api

Merge remote-tracking branch 'origin/master' into merge-upstream

2017-11-17 17:40:00 -06:00

auth

Fix some rubocop style issues (#5730)

2017-11-17 10:06:26 +09:00

concerns

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

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

oauth

…

settings

Merge tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5

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

well_known

…

about_controller.rb

…

account_follow_controller.rb

…

account_unfollow_controller.rb

…

accounts_controller.rb

Encode custom emojis as resolveable objects in ActivityPub (#5243)

2017-10-07 17:43:42 +02:00

application_controller.rb

Themed prefetching

2017-11-16 21:37:08 -08:00

authorize_follows_controller.rb

…

emojis_controller.rb

Encode custom emojis as resolveable objects in ActivityPub (#5243)

2017-10-07 17:43:42 +02:00

follower_accounts_controller.rb

Encode custom emojis as resolveable objects in ActivityPub (#5243)

2017-10-07 17:43:42 +02:00

following_accounts_controller.rb

Encode custom emojis as resolveable objects in ActivityPub (#5243)

2017-10-07 17:43:42 +02:00

home_controller.rb

Themed prefetching

2017-11-16 21:37:08 -08:00

intents_controller.rb

…

manifests_controller.rb

Make Chrome splash screen same color as web UI's background color (#5169)

2017-10-02 01:23:32 +02:00

media_controller.rb

…

media_proxy_controller.rb

Fix incomplete account records being read (#4998)

2017-09-19 06:53:16 +02:00

remote_follow_controller.rb

…

shares_controller.rb

…

statuses_controller.rb

Encode custom emojis as resolveable objects in ActivityPub (#5243)

2017-10-07 17:43:42 +02:00

stream_entries_controller.rb

try to tighten up local only toot stuff, like... properly (#163)

2017-10-09 09:56:17 -04:00

tags_controller.rb

Redesign public hashtag pages (#5237)

2017-10-07 20:00:35 +02:00