mastodon

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	720cb01715	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.	2018-12-18 16:55:15 +01:00
Eugen Rochko	32bd452b56	Remove "most popular" tab from profile directory, add responsive design (#9539 ) * Remove "most popular" tab from profile directory, add responsive design * Remove unused translations	2018-12-17 03:14:28 +01:00
Thibaut Girka	04204427d0	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.	2018-12-15 10:45:53 +01:00
ThibG	0686523e18	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	2018-12-11 19:18:29 +01:00
Thibaut Girka	7dfd0c7995	Fix directory controller in glitch-soc	2018-12-09 16:08:10 +01:00
Eugen Rochko	fd8ca11f19	Add profile directory (#9427 ) Fix #5578	2018-12-06 17:36:11 +01:00

6 Commits (a0a32a68c47893577c4749eb97c35ee067b4738b)