mastodon - Plural Café fork of Mastodon/Glitch Social

Age	Commit message (Collapse)	Author
2020-02-20	Fix missing authentication call in filters controller (#12746)	Eugen Rochko

2020-01-10	add custom filter master toggle, add media gallery mode, & fix various ↵	multiple creatures
	filter logic + caching bugs
2020-01-10	add ability to toggle individual filters without deleting them	multiple creatures

2019-11-18	Remove unused and incompatable filter settings. These will be re-added in ↵	multiple creatures
	time as they're rewritten to use database-level filtering.
2019-10-09	custom filters can now also match posts with missing media descriptions	multiple creatures

2019-10-09	custom filters can now match media descriptions	multiple creatures

2019-08-15	custom filters now have an option to add or override content warnings; ↵	multiple creatures
	filter caching has been fixed
2019-08-02	filters now have options to separately match post text, content ↵	multiple creatures
	warnings/titles, & hashtags + option to filter threads containing a matching post
2019-05-21	Custom filters: add ability to create filters that exclude or are exclusive ↵	multiple creatures
	to roars with attachments.
2018-10-26	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.
2018-10-25	Set @body_classes to admin layout (#9081)	Yamagishi Kazutoshi

2018-07-12	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka

2018-07-12	Fix whole-word selection and i18n: Add Japanese translation for Whole-word ↵	mayaeh
	(#8004) * Add Japanese translation for "Whole word" and add it's description. * Fix to enable "Whole-word" selection.
2018-07-09	Set appropriate assets pack for the keyword filter page	Thibaut Girka

2018-06-29	Keyword/phrase filtering (#7905)	Eugen Rochko
	* Add keyword filtering GET\|POST /api/v1/filters GET\|PUT\|DELETE /api/v1/filters/:id - Irreversible filters can drop toots from home or notifications - Other filters can hide toots through the client app - Filters use a phrase valid in particular contexts, expiration * Make sure expired filters don't get applied client-side * Add missing API methods * Remove "regex filter" from column settings * Add tests * Add test for FeedManager * Add CustomFilter test * Add UI for managing filters * Add streaming API event to allow syncing filters * Fix tests