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 9044a2b051 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/directories/index.html.haml Upstream has redesigned the profile directory, and we had a glitch-soc-specific change to hide follower counts. Ported that change to the new design.		2019-08-30 13:38:41 +02:00
..
accounts	Fix error in REST API for an account's statuses (#11700)	2019-08-30 02:49:44 +02:00
admin	Add moderation API (#9387)	2019-06-20 02:52:34 +02:00
apps	Add vapid_key to the application entity in the REST API (#10058)	2019-02-16 05:27:05 +01:00
instances	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
lists	…
polls	Add polls (#10111)	2019-03-03 22:18:23 +01:00
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	Remove deprecated REST API `GET /api/v1/timelines/direct` (#11212)	2019-07-05 02:14:56 +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	Add (back) rails-level JSON caching (#11333)	2019-07-21 22:32:16 +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	…
filters_controller.rb	…
follow_requests_controller.rb	…
instances_controller.rb	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
lists_controller.rb	…
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	Add a preferences API so apps can share basic behaviours (#10109)	2019-03-15 02:39:20 +01:00
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	Add scheduled statuses (#9706)	2019-01-05 12:43:28 +01:00
search_controller.rb	Add env variable to control search limit	2019-07-20 16:39:48 +02:00
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