56 Commits (b45f555a0c7a7d50ed7640b938eb8b5a671a0e10)

Author	SHA1	Message	Date
Thibaut Girka	20d01a954e	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 Conflicts due to the addition of a new preference upstream, “advanced layout”.	6 years ago
Eugen Rochko	1e5532e693	Add responsive panels to the single-column layout (#10820) ... * Add responsive panels to the single-column layout * Fixes * Fix not being able to save the preference * Fix code style issues * Set max-height on the compose textarea and add a link to relationship manager	6 years ago
Thibaut Girka	a6b7c23f6f	Add option for default toot content-type	6 years ago
Thibaut Girka	5085559b15	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.	6 years ago
Eugen Rochko	36b39fbac5	Add preference to disable e-mails about new pending accounts (#10529)	6 years ago
ThibG	ed30110618	Make displaying application used to toot opt-in (#9897) ... * Make storing and displaying application used to toot opt-in * Revert to storing application info, and display it to the author via API	6 years ago
Thibaut Girka	05415fa5d3	Make storing and displaying application used to toot opt-in	6 years ago
Thibaut Girka	bd23288a52	Add a per-user setting to hide followers count ... This is only available if the instance-wide setting isn't set and allows people to hide their own followers count. This does not hide others' to them.	6 years ago
ysksn	b048926e67	Create Settings::BaseController (#9507) ... Define `Settings::BaseController#set_body_classes` so that sub classes inherit `Settings::BaseController` don't need to define `#set_body_classes` agein.	6 years ago
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.	6 years ago
ThibG	81bda7d67c	Add setting to not aggregate reblogs (#9248) ... * Add setting to not aggregate reblogs Fixes #9222 * Handle cases where user is nil in add_to_home and add_to_list * Add hint for setting_aggregate_reblogs option * Reword setting_aggregate_reblogs label	6 years ago
Yamagishi Kazutoshi	e8ffecbd36	Set @body_classes to admin layout (#9081)	7 years ago
Thibaut Girka	c91d9b7389	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb	7 years ago
ふぁぼ原	f7a6f9489d	Add a new preference to always hide all media (#8569)	7 years ago
Matt Sweetman	1889526e23	Add user preference to always expand toots marked with content warnings (#8762)	7 years ago
Thibaut Girka	6c233a04a0	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: README.md Discarded upstream changes to the README, kept our version.	7 years ago
Eugen Rochko	c593d6df9c	Add preference for report notification e-mails, skip for duplicates (#8559) ... If an unresolved report for the same target account already exists, no new notification is generated	7 years ago
Thibaut Girka	ab5f450700	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields	7 years ago
Eugen Rochko	a58ec29631	Allow selecting default posting language instead of auto-detect (#7828) ... * Allow selecting default posting language instead of auto-detect * Enable default language setting in credentials API * Fix form saving	7 years ago
Eugen Rochko	7eec279c7f	Change language opt-out to language opt-in (#7823) ... * Switch filtered_languages to chosen_languages * Adjust interface * Remove unused translations	7 years ago
David Yip	e0eebba461	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml	7 years ago
Eugen Rochko	1e02dc8715	Add preference to hide following/followers lists (#7532) ... * Add preference to hide following/followers lists - Public pages - ActivityPub collections (does not return pages but does give total) - REST API (unless it's your own) (does not federate) Fix #6901 * Add preference * Add delegation * Fix issue * Fix issue	7 years ago
David Yip	020b40efdb	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: .travis.yml app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_detailed_status.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml	7 years ago
Eugen Rochko	76f3d5d16b	Add preference to always display sensitive media (#6448)	7 years ago
kibigo!	dabf66e676	Moved flavour UI into own prefs tab	7 years ago
cwm	abe95b614b	add initial components based off of tootsuite pr #1507	7 years ago
kibigo!	5bed0f10ed	Various fixes	7 years ago
kibigo!	541fe9b110	Skins support	7 years ago
kibigo!	bdbbd06dad	Finalized theme loading and stuff	7 years ago
Nolan Lawson	fa0be3f834	Add option to reduce motion (#5393) ... * Add option to reduce motion * Use HOC to wrap all Motion calls * fix case-sensitive issue * Avoid updating too frequently * Get rid of unnecessary change to _simple_status.html.haml	8 years ago
Andrew	0401a24558	Add support for multiple themes (#4959) ... * Add support for selecting a theme * Fix codeclimate issues * Look up site default style if current user is not available due to e.g. not being logged in * Remove outdated comment in common.js * Address requested changes in themes PR * Fix codeclimate issues * Explicitly check current_account in application controller and only check theme availability if non-nil * codeclimate * explicit precedence with && * Fix code style in application_controller according to @nightpool's suggestion, use default style in embedded.html.haml * codeclimate: indentation + return	8 years ago
Yamagishi Kazutoshi	3267e4a785	Add unfollow modal (optional) (#4246) ... * Add unfollow modal * unfollowing someone * remove unnecessary prop	8 years ago
Eugen Rochko	c42092ba7a	Add option to opt out of search engines on public profile/status pages (#4199)	8 years ago
Yamagishi Kazutoshi	2b9721d1b3	Add setting a always mark media as sensitive (#4136)	8 years ago
Damien Erambert	18d3fa953b	Add a setting allowing the use of system's default font in Web UI (#4033) ... * add a system_font_ui setting on the server * Plug the system_font_ui on the front-end * add EN/FR locales for the new setting * put Roboto after all other fonts * remove trailing whitespace so CodeClimate is happy * fix user_spec.rb * correctly write user_spect this time * slightly better way of adding the classes * add comments to the system-font stack for clarification * use .system-font for the class instead * don't use multiple lines for comments * remove trailing whitespace * use the classnames module for consistency * use `mastodon-font-sans-serif` instead of Roboto directly	8 years ago
Atsushi Yamamoto	402c19a924	Add preference setting for delete toot modal (#3368) ... * Set delete_modal preference to true by default * Does not show confirmation modal if delete_modal is false * Add ja translation for preference setting page	8 years ago
Tomonori Murakami	7966d3a872	Fix locale bug when change it on preferences (#3223) (#3232)	8 years ago
Matt Jankowski	8f4b7c1820	Filter languages with opt out (#3175) ... * Remove allowed_languages and add filtered_languages * Use filtered_languages instead of allowed_languages	8 years ago
Matt Jankowski	f025cc6782	Filter on allowed user language preferences (#2361) ... * Naive approached to timeline filtering * Convert allowed_languages into a db column * Allow users to choose languages to see statuses in * Style list items as two columns * Add a hint to explain language filtering preference	8 years ago
Matt Jankowski	2dda356e3f	Clean up settings/preferences controller (#2237) ... * Add missing fields group on preferences page * Clean up settings/preferences controller * Extract a UserSettingsDecorator	8 years ago
Matt Jankowski	a8e1afc30a	Simplify render in controllers (#2144)	8 years ago
Eugen Rochko	42d54dc9ea	Adjust visuals of non-autoplaying GIFV	8 years ago
Patrick Figel	ffb99325ca	Add gif auto-play/pause preference ... This introduces a new per-user preference called "Auto-play animated GIFs", which is enabled by default. When a user disables this setting, gifs in toots become click-to-play. Previews of animated gifs were changed to display the video play button so that users can distinguish them from regular images. This setting also affects account avatars in the detailed account view, which was changed to use the same hover-to-play mechanism that is used for animated avatars in timelines. Fixes #1652	8 years ago
blackle	06444bf050	Allow user to disable the boost confirm dialog in preferences	8 years ago
Eugen Rochko	6b81d10030	Add digest e-mails	8 years ago
Eugen Rochko	714e41d472	Fix preferences save	8 years ago
Eugen Rochko	347a153b3d	Add API modifiers to limit returned toots from public/hashtag timelines ... to only those from local users; Add link to "extended information" to getting started in the UI; Add defaults for posting privacy; Change how publish button looks depending on posting privacy chosen	8 years ago
Eugen Rochko	f4bc9620a9	Update settings to re-use admin layout, one big navigation tree, improve settings forms	8 years ago
Eugen Rochko	b11fdc3ae3	Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings ... with YAML-defined defaults. Add admin page for editing global settings. Add "site_description" setting that would show as a paragraph on the frontpage	8 years ago
Eugen Rochko	eca6110fc4	Add preferences for follow request notification e-mails	8 years ago