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

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

..

activitypub

…

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

…

settings

Migrate glitch-soc keyword mutes to Mastodon's

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

well_known

…

about_controller.rb

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

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

account_follow_controller.rb

…

account_unfollow_controller.rb

…

accounts_controller.rb

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

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

application_controller.rb

…

authorize_follows_controller.rb

…

emojis_controller.rb

…

filters_controller.rb

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

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

follower_accounts_controller.rb

…

following_accounts_controller.rb

…

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

…

media_controller.rb

…

media_proxy_controller.rb

…

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

…

statuses_controller.rb

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

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

stream_entries_controller.rb

…

tags_controller.rb

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

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