David Yip 82b2e224a2 Merge branch 'gs-master' into prevent-local-only-federation ...

Conflicts:
	db/schema.rb

2017-12-15 12:20:56 -06:00

..

activitypub

move outbox filtering to Status#permitted_for (as per @ekiru)

2017-12-11 15:28:04 -06:00

admin

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-13 18:17:16 +00:00

api

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

2017-12-12 02:54:13 -06:00

auth

…

concerns

Apply a 25x rate limit by IP even to authenticated requests (#5948)

2017-12-11 15:32:29 +01:00

oauth

change pack to 'auth'

2017-12-11 18:14:41 -06:00

settings

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-15 01:17:12 +00:00

well_known

…

about_controller.rb

…

account_follow_controller.rb

…

account_unfollow_controller.rb

…

accounts_controller.rb

filter local-only statuses from public pages

2017-12-10 17:23:01 -06:00

application_controller.rb

Javascript intl8n flavour support

2017-12-10 11:08:04 -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

…

following_accounts_controller.rb

…

home_controller.rb

…

intents_controller.rb

…

invites_controller.rb

Use settings pack for InvitesController (#229)

2017-12-06 17:20:04 -06:00

manifests_controller.rb

…

media_controller.rb

…

media_proxy_controller.rb

…

remote_follow_controller.rb

…

shares_controller.rb

…

statuses_controller.rb

…

stream_entries_controller.rb

…

tags_controller.rb

…