Ondřej Hruška 7a1ca8b0df Merge remote-tracking branch 'upstream/master'

2017-08-07 22:43:52 +02:00

..

activitypub

Minor ActivityPub JSON fixes (#4214)

2017-07-16 10:28:55 +02:00

admin

Add button to re-subscribe to all accounts from a domain (#4285)

2017-07-20 23:07:13 +02:00

api

Merge git://github.com/tootsuite/mastodon into tootsuite-master

2017-07-25 21:36:22 +02:00

auth

Redirect to PasswordController#new when reset_password_token is invalid (#4506)

2017-08-03 17:45:45 +02:00

concerns

HTTP signatures (#4146)

2017-07-14 20:41:49 +02:00

oauth

Fix #1165 - before_action was called before protect_from_forgery

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

settings

Fix #4026 - Accept backup codes for disabling 2FA (#4382)

2017-07-26 23:36:33 +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

Correct OStatus inflection (Ostatus -> OStatus) (#4255)

2017-07-19 01:37:26 +02:00

application_controller.rb

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

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

authorize_follows_controller.rb

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

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

follower_accounts_controller.rb

Minor ActivityPub JSON fixes (#4214)

2017-07-16 10:28:55 +02:00

following_accounts_controller.rb

Minor ActivityPub JSON fixes (#4214)

2017-07-16 10:28:55 +02:00

home_controller.rb

Multiple frontend support (#110)

2017-07-30 19:28:21 +02:00

manifests_controller.rb

Fix #3063 - Add dynamic app manifest (#3563)

2017-06-06 19:29:42 +02:00

media_controller.rb

Extract authorization policy for viewing statuses (#3150)

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

remote_follow_controller.rb

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

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

statuses_controller.rb

Improve ActivityPub representations (#3844)

2017-07-15 03:01:39 +02:00

stream_entries_controller.rb

Correct OStatus inflection (Ostatus -> OStatus) (#4255)

2017-07-19 01:37:26 +02:00

tags_controller.rb

Minor ActivityPub JSON fixes (#4214)

2017-07-16 10:28:55 +02:00