Thibaut Girka 369a475a70 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/serializers/rest/instance_serializer.rb - app/views/layouts/error.html.haml - public/oops.png Took our version (same as upstream but without the things that only make sense in an animation). Additional changes: - app/javascript/flavours/vanilla/theme.yml Include upstream's javascript in error pages.		2019-02-17 12:26:55 +01:00
..
accounts	Add featured hashtags to profiles (#9755)	2019-02-04 04:25:59 +01:00
apps	Add vapid_key to the application entity in the REST API (#10058)	2019-02-16 05:27:05 +01:00
instances	…
lists	Extract counters from accounts table to account_stats table (#9295)	2018-11-19 00:43:52 +01:00
push	…
statuses	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-19 18:28:37 +01:00
timelines	Allow joining several hashtags in a single column (#8904)	2018-11-05 18:53:25 +01:00
accounts_controller.rb	Add locale param to sign-up API (#9747)	2019-01-07 14:50:20 +01:00
apps_controller.rb	…
blocks_controller.rb	Extract counters from accounts table to account_stats table (#9295)	2018-11-19 00:43:52 +01:00
bookmarks_controller.rb	…
conversations_controller.rb	Add unread indicator to conversations (#9009)	2018-10-19 01:47:29 +02:00
custom_emojis_controller.rb	Add cache to custom emojis API (#9732)	2019-01-06 23:52:58 +01:00
domain_blocks_controller.rb	…
endorsements_controller.rb	Extract counters from accounts table to account_stats table (#9295)	2018-11-19 00:43:52 +01:00
favourites_controller.rb	Support min_id-based pagination in REST API (#8736)	2018-09-28 02:23:45 +02:00
filters_controller.rb	…
follow_requests_controller.rb	Extract counters from accounts table to account_stats table (#9295)	2018-11-19 00:43:52 +01:00
follows_controller.rb	…
instances_controller.rb	Cache instance info (#8765)	2018-09-24 16:15:49 +02:00
lists_controller.rb	Add backend support to read and update list-specific show_replies settings	2018-11-28 14:46:07 +01:00
media_controller.rb	…
mutes_controller.rb	…
notifications_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-01 12:43:20 +02:00
reports_controller.rb	Add unread indicator to conversations (#9009)	2018-10-19 01:47:29 +02:00
scheduled_statuses_controller.rb	Add scheduled statuses (#9706)	2019-01-05 12:43:28 +01:00
search_controller.rb	…
statuses_controller.rb	Add scheduled statuses (#9706)	2019-01-05 12:43:28 +01:00
streaming_controller.rb	…
suggestions_controller.rb	…