6 commits

Author	SHA1	Message	Date
Thibaut Girka	16ff7c5627	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb	2019-09-30 12:23:57 +02:00
Eugen Rochko	ab33c4df94	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	2019-09-28 01:02:21 +02:00
Thibaut Girka	74c5b2bd08	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)	2019-09-13 18:13:43 +02:00
Eugen Rochko	18331fefa2	Remove deprecated GET /api/v1/search API (#11823) ... Use `GET /api/v2/search` instead	2019-09-13 16:11:13 +02:00
Eugen Rochko	e7f20cc43f	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	2019-02-26 15:21:36 +01:00
Eugen Rochko	8bb74e50be	Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661)	2018-05-29 02:01:24 +02:00