Thibaut Girka 0158937fc2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Dockerfile Took upstream version and reverted f13ebd02c9. Hopefuly it's not needed anymore. - app/controllers/api/v1/search_controller.rb The conflict was due to us raising the number of results returned. Upstream raised it further, so took it. - config/locales/de.yml Took upstream changes to theme translation strings. - config/locales/gl.yml Took upstream changes to theme translation strings. - config/locales/nl.yml Took upstream changes to theme translation strings. - config/locales/sk.yml Took upstream changes to theme translation strings.		2019-02-26 17:04:44 +01:00
..
activitypub	Add specs for activitypub collections controller (#9484)	2018-12-10 21:39:25 +01:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-26 17:04:44 +01:00
api	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-26 17:04:44 +01:00
auth	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-15 18:02:45 +01:00
concerns	Improvements to signature verification (#9667)	2019-01-07 21:45:13 +01:00
oauth	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-10 21:10:09 +01:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-10 21:10:09 +01: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	2019-02-10 21:10:09 +01:00
application_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-27 13:23:02 +01: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	Add admin custom CSS setting (#8399)	2018-08-24 04:33:27 +02:00
directories_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-20 16:49:23 +01:00
emojis_controller.rb	Unuse ActiveRecord::Base#cache_key (#8185)	2018-08-19 15:52:38 +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	Add a per-user setting to hide followers count	2018-12-20 14:51:12 +01:00
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 remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00
invites_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-26 20:41:43 +02:00
manifests_controller.rb
media_controller.rb	fix CSP / X-Frame-Options for media embeds (#9558)	2018-12-18 16:40:30 +01:00
media_proxy_controller.rb
remote_follow_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-18 18:04:49 +02:00
remote_interaction_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01: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-12-06 12:44:38 +01: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	2019-01-19 18:28:37 +01:00