Thibaut Girka 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json		2019-08-19 21:49:35 +02:00
..
activitypub	Fix multiple issues with replies collection for pages further than self-replies (#11582)	2019-08-16 22:58:51 +02:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-12 16:24:22 +02:00
api	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-12 16:24:22 +02:00
auth	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-23 10:51:07 +02:00
concerns	Add HTTP signature keyId to request log (#11591)	2019-08-18 18:03:56 +02:00
oauth	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-23 10:51:07 +02:00
settings	Add option to disable emoji replacements	2019-08-12 23:01:37 +02:00
well_known	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-05 13:13:28 +02:00
about_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +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	2019-08-19 21:49:35 +02:00
application_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
authorize_interactions_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-18 18:04:49 +02:00
custom_css_controller.rb	Fix custom CSS controller (#11336)	2019-07-17 17:14:25 +02:00
directories_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-07 13:56:48 +02:00
emojis_controller.rb	Add (back) rails-level JSON caching (#11333)	2019-07-21 22:32:16 +02:00
filters_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-26 20:41:43 +02:00
follower_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
following_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
home_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
instance_actors_controller.rb	Fix reverse-proxy caching of instance actor object (#11561)	2019-08-13 15:30:37 +02:00
intents_controller.rb	Refactor controllers for statuses, accounts, and more (#11249)	2019-07-08 12:03:45 +02:00
invites_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
manifests_controller.rb	Bump active_model_serializers from 0.10.9 to 0.10.10 (#11311)	2019-07-23 11:10:42 +02:00
media_controller.rb	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
media_proxy_controller.rb	Fix uncaught 422 and 500 errors (#11590)	2019-08-18 18:04:18 +02:00
public_timelines_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
relationships_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-28 13:01:33 +01:00
remote_follow_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
remote_interaction_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-08 08:44:33 +02:00
shares_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
statuses_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-12 16:24:22 +02:00
tags_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00