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

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

..

activitypub

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

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

admin

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

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

api

Merge upstream 2.0ish #165

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

auth

Set InstancePresenter to Auth::RegistrationsController#create (#5366)

2017-10-13 09:35:07 +02:00

concerns

Fix UserTrackingConcern firing on every request, optimize some queries (#5368)

2017-10-13 16:44:29 +02:00

oauth

Fix #1165 - before_action was called before protect_from_forgery

2017-04-08 02:30:50 +02:00

settings

Add option to reduce motion (#5393)

2017-10-16 09:36:15 +02:00

well_known

Ensure well_known controllers use WEB_DOMAIN by including RoutingHelper (#2388)

2017-06-02 22:21:36 +02:00

about_controller.rb

Redesign the landing page, mount public timeline on it (#4122)

2017-07-11 15:27:59 +02:00

account_follow_controller.rb

Restful refactor of accounts/ routes (#2133)

2017-04-19 13:52:37 +02:00

account_unfollow_controller.rb

Restful refactor of accounts/ routes (#2133)

2017-04-19 13:52:37 +02:00

accounts_controller.rb

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

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

application_controller.rb

Better themeing support!!

2017-09-25 19:24:32 -07:00

authorize_follows_controller.rb

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

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

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

Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream

2017-09-28 09:12:17 +02:00

intents_controller.rb

Add protocol handler. Handle follow intents (#4511)

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

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

Extract authorization policy for viewing statuses (#3150)

2017-05-29 18:22:22 +02:00

media_proxy_controller.rb

Fix incomplete account records being read (#4998)

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

remote_follow_controller.rb

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

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

shares_controller.rb

Make share intent modal to make "signed in as" shown. (#4611)

2017-08-16 16:48:44 +02:00

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