Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.		2018-12-09 16:08:04 +01:00
..
accounts	Add profile directory (#9427)	2018-12-06 17:36:11 +01:00
apps	…
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	2018-11-27 13:23:02 +01:00
timelines	Allow joining several hashtags in a single column (#8904)	2018-11-05 18:53:25 +01:00
accounts_controller.rb	Optimize the process of following someone (#9220)	2018-11-08 21:05:42 +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	…
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	…
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	…
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	…
reports_controller.rb	Add unread indicator to conversations (#9009)	2018-10-19 01:47:29 +02:00
search_controller.rb	…
statuses_controller.rb	…
streaming_controller.rb	…
suggestions_controller.rb	…