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

Merge branch 'gs-master' into glitch-theme

2017-12-04 11:07:01 -06:00

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

Remove rabl dependency (#5894)

2017-12-06 15:04:49 +09:00

about_controller.rb

Finalized theme loading and stuff

2017-11-20 22:13:37 -08: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

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

Finalized theme loading and stuff

2017-11-20 22:13:37 -08: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

Finalized theme loading and stuff

2017-11-20 22:13:37 -08:00

following_accounts_controller.rb

Finalized theme loading and stuff

2017-11-20 22:13:37 -08:00

home_controller.rb

Finalized theme loading and stuff

2017-11-20 22:13:37 -08:00

intents_controller.rb

Add protocol handler. Handle follow intents (#4511)

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

invites_controller.rb

Use settings pack for InvitesController (#229)

2017-12-06 17:20:04 -06: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

Finalized theme loading and stuff

2017-11-20 22:13:37 -08:00

shares_controller.rb

Finalized theme loading and stuff

2017-11-20 22:13:37 -08:00

statuses_controller.rb

Finalized theme loading and stuff

2017-11-20 22:13:37 -08:00

stream_entries_controller.rb

Finalized theme loading and stuff

2017-11-20 22:13:37 -08:00

tags_controller.rb

Finalized theme loading and stuff

2017-11-20 22:13:37 -08:00