mastodon - Plural Café fork of Mastodon/Glitch Social

Age	Commit message (Collapse)	Author
2019-09-30	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb
2019-09-28	Add `exclude_unreviewed` param to `GET /api/v2/search` REST API (#11977)	Eugen Rochko
	Make it so normal search returns even unreviewed matches, but autosuggestions do not. Fix #11960
2019-09-13	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme)
2019-09-13	Remove deprecated `GET /api/v1/search` API (#11823)	Eugen Rochko
	Use `GET /api/v2/search` instead
2019-02-26	Add type, limit, offset, min_id, max_id, account_id to search API (#10091)	Eugen Rochko
	* Add type, limit, offset, min_id, max_id, account_id to search API Fix #8939 * Make the offset work on accounts and hashtags search as well * Assure brakeman we are not doing mass assignment here * Do not allow paginating unless a type is chosen * Fix search query and index id field on statuses instead of created_at
2018-05-29	Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661)	Eugen Rochko