This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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
..
accounts	Fix error in REST API for an account's statuses (#11700)	2019-08-30 02:49:44 +02:00
admin	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	2019-09-11 16:32:44 +02:00
apps	…
featured_tags	Add featured tags API (#11778)	2019-09-09 10:50:33 +02:00
instances	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
lists	…
polls	…
push	Fix web push notifications for polls (#10864)	2019-05-28 00:26:08 +02:00
statuses	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-29 12:07:50 +02:00
timelines	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-13 18:13:43 +02:00
accounts_controller.rb	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
apps_controller.rb	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
blocks_controller.rb	…
bookmarks_controller.rb	…
conversations_controller.rb	…
custom_emojis_controller.rb	Change unlisted custom emoji to not appear in autosuggestions (#11818)	2019-09-13 16:01:09 +02:00
directories_controller.rb	Add profile directory to web UI (#11688)	2019-08-30 00:14:36 +02:00
domain_blocks_controller.rb	…
endorsements_controller.rb	…
favourites_controller.rb	…
featured_tags_controller.rb	Add featured tags API (#11778)	2019-09-09 10:50:33 +02:00
filters_controller.rb	…
follow_requests_controller.rb	Add updated relationship to follow request API responses (#11800)	2019-09-10 20:56:42 +02:00
instances_controller.rb	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
lists_controller.rb	…
markers_controller.rb	Add timeline read markers API (#11762)	2019-09-06 13:55:51 +02:00
media_controller.rb	…
mutes_controller.rb	…
notifications_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-23 19:01:30 +02:00
polls_controller.rb	Fix poll API not requiring authentication on non-public polls (#10960)	2019-06-04 20:10:26 +02:00
preferences_controller.rb	…
reports_controller.rb	Add soft delete for statuses for instant deletes through API (#11623)	2019-08-22 21:55:56 +02:00
scheduled_statuses_controller.rb	…
statuses_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-29 12:07:50 +02:00
streaming_controller.rb	…
suggestions_controller.rb	…
trends_controller.rb	Change admin UI for hashtags and add back whitelisted trends (#11490)	2019-08-05 19:54:29 +02:00