Thibaut Girka 84a2587d44 Merge branch 'master' into glitch-soc/merge-upstream

2018-08-11 15:45:42 +02:00

..

activitypub

Better pagination for ActivityPub outbox (#7356)

2018-05-04 19:19:11 +02:00

admin

Fix statuses batch checkboxes in admin panel (fixes #411)

2018-08-11 15:45:12 +02:00

api

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-10 16:22:31 +02:00

auth

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-01 00:18:13 +02:00

concerns

Redesign public profiles and toots (#8068)

2018-07-28 19:25:33 +02:00

oauth

Merge branch 'master' into glitch-soc/merge-upstream

2018-05-19 22:41:10 +02:00

settings

Migrate glitch-soc keyword mutes to Mastodon's

2018-07-09 19:19:23 +02:00

well_known

Make host_meta/webfinger replies cacheable (fixes #6100) (#6101)

2017-12-27 18:21:12 +01:00

about_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-10 16:22:31 +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

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-10 16:22:31 +02:00

application_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-05-27 13:20:15 +02:00

authorize_follows_controller.rb

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

2018-01-24 19:17:11 +00:00

emojis_controller.rb

Cache JSON of immutable ActivityPub representations (#6171)

2018-01-04 01:21:38 +01:00

filters_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-07-12 19:26:20 +02:00

follower_accounts_controller.rb

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

2018-05-18 08:47:10 -05:00

following_accounts_controller.rb

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

2018-05-18 08:47:10 -05:00

home_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-11 15:45:42 +02:00

intents_controller.rb

Add tests for intents_controller (#7763)

2018-06-09 22:47:50 +02:00

invites_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-01 00:18:13 +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

Save video metadata and improve video OpenGraph tags (#6481)

2018-02-16 07:22:20 +01:00

media_proxy_controller.rb

Raise Mastodon::RaceConditionError if Redis lock failed (#7511)

2018-05-16 12:29:45 +02:00

remote_follow_controller.rb

Merge branch 'master' into glitch-soc/tentative-merge

2018-07-09 07:13:59 +02:00

remote_unfollows_controller.rb

Add tests for remote_unfollows_controller (#7879)

2018-06-24 19:55:55 +09:00

shares_controller.rb

Merge branch 'master' into glitch-soc/merge

2018-05-11 18:12:42 +02:00

statuses_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-01 00:18:13 +02:00

stream_entries_controller.rb

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-03 17:23:44 -05:00

tags_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-01 00:18:13 +02:00