glitchier-soc

Author	SHA1	Message	Date
Thibaut Girka	acbed64f3d	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb - config/locales/simple_form.en.yml	5 years ago
ThibG	4b3d91dc2c	Add option to disable blurhash previews (#11188 ) * Add option to disable blurhash previews * Update option text * Change options order	5 years ago
Thibaut Girka	5a158899bc	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb	5 years ago
Eugen Rochko	8bf8d6d9d9	Change preferences page into appearance, notifications, and other (#10977 )	5 years ago