11 Commits (bde35e7878c81a3f87b8f6876592c7d054bd2e5d)

Author	SHA1	Message	Date
Thibaut Girka	41a98b6543	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/helpers/statuses_helper.rb Upstream moved account helpers to their own file, we had extra helpers there, moved too. - app/lib/sanitize_config.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - config/locales/simple_form.en.yml - spec/lib/sanitize_config_spec.rb	5 years ago
Faye Duxovni	48f75b86ae	Add setting for whether to crop images in unexpanded toots (#12126)	5 years ago
Thibaut Girka	597ea5687a	Add option to disable emoji replacements ... Fixes #647 The option is found in `/settings` (because that was easier to write it this way) but only affects the glitch-soc front-end.	5 years ago
Thibaut Girka	04534604c6	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/views/admin/dashboard/index.html.haml - config/locales/simple_form.en.yml	5 years ago
Eugen Rochko	9072fe5ab6	Add trends UI with admin and user settings (#11502)	5 years ago
Eugen Rochko	729723f857	Add option to disable real-time updates in web UI (#9984) ... Fix #9031 Fix #7913	5 years ago
Eugen Rochko	9b1d3e4acb	Add option to disable real-time updates in web UI (#9984) ... Fix #9031 Fix #7913	5 years ago
Thibaut Girka	aaec64a500	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	3086c645fd	Add option to disable blurhash previews (#11188) ... * Add option to disable blurhash previews * Update option text * Change options order	5 years ago
Thibaut Girka	1b0ff4cd69	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	1db4117030	Change preferences page into appearance, notifications, and other (#10977)	5 years ago