8 Commits (6dbb10c4b7b1bfbe740145d1b4ce6d3b6dff9af9)

Author	SHA1	Message	Date
Thibaut Girka	3e686beaea	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/routes.rb Upstream changed some admin routes, conflict was because of an added :show action for statuses on our side. Kept it.	6 years ago
Eugen Rochko	59e333385b	Show 40 profiles per directory page instead of 30 (#9609) ... To better align with the list of hashtags	6 years ago
Thibaut Girka	034ffc079e	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.	6 years ago
Eugen Rochko	087e118971	Remove "most popular" tab from profile directory, add responsive design (#9539) ... * Remove "most popular" tab from profile directory, add responsive design * Remove unused translations	6 years ago
Thibaut Girka	65e994b29b	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours.	6 years ago
ThibG	720daa8143	Add instance-wide setting to disable profile directory (#9497) ... * Add instance-wide setting to disable profile directory Fixes #9496 When the profile directory is disabled: - The “discoverable” setting is hidden from users - The “profile directory” link is not shown on public pages - /explore returns 404 * Move Setting.profile_directory check to a before_action filter	6 years ago
Thibaut Girka	4f59d1efd7	Fix directory controller in glitch-soc	6 years ago
Eugen Rochko	73be8f38c1	Add profile directory (#9427) ... Fix #5578	6 years ago