6 Commits (24479183168a0ab5fb603a53587e832459e5c451)

Author	SHA1	Message	Date
Thibaut Girka	cc94c90bf1	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb	5 years ago
Eugen Rochko	66d3e13777	Add `exclude_unreviewed` param to `GET /api/v2/search` REST API (#11977) ... Make it so normal search returns even unreviewed matches, but autosuggestions do not. Fix #11960	5 years ago
Thibaut Girka	2e38d889a3	Merge branch 'master' into glitch-soc/merge-upstream ... 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)	5 years ago
Eugen Rochko	8824964836	Remove deprecated `GET /api/v1/search` API (#11823) ... Use `GET /api/v2/search` instead	5 years ago
Eugen Rochko	693f2353bc	Add type, limit, offset, min_id, max_id, account_id to search API (#10091) ... * 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	6 years ago
Eugen Rochko	744d47dee2	Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661)	6 years ago