Thibaut Girka 48b8a1f414 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/models/status.rb
- app/services/remove_status_service.rb
- db/schema.rb

All conflicts were due to the addition of a `deleted_at` attribute
to Statuses and reworked database indexes.

2019-08-29 12:07:50 +02:00

..

accounts

Fix pinned statuses API returning pagination headers (#11526)

2019-08-08 23:04:04 +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

Extract counters from accounts table to account_stats table (#9295)

2018-11-19 00:43:52 +01:00

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

Extract counters from accounts table to account_stats table (#9295)

2018-11-19 00:43:52 +01:00

bookmarks_controller.rb

Introduce OAuth scopes for bookmarks

2018-08-10 15:26:52 +02:00

conversations_controller.rb

Add unread indicator to conversations (#9009)

2018-10-19 01:47:29 +02:00

custom_emojis_controller.rb

Add (back) rails-level JSON caching (#11333)

2019-07-21 22:32:16 +02:00

domain_blocks_controller.rb

Add more granular OAuth scopes (#7929)

2018-07-05 18:31:35 +02:00

endorsements_controller.rb

Extract counters from accounts table to account_stats table (#9295)

2018-11-19 00:43:52 +01:00

favourites_controller.rb

Support min_id-based pagination in REST API (#8736)

2018-09-28 02:23:45 +02:00

filters_controller.rb

Add option to not consider word boundaries when processing keyword filtering (#7975)

2018-07-09 02:22:09 +02:00

follow_requests_controller.rb

Extract counters from accounts table to account_stats table (#9295)

2018-11-19 00:43:52 +01:00

instances_controller.rb

Add whitelist mode (#11291)

2019-07-30 11:10:46 +02:00

lists_controller.rb

Add backend support to read and update list-specific show_replies settings

2018-11-28 14:46:07 +01:00

media_controller.rb

Add more granular OAuth scopes (#7929)

2018-07-05 18:31:35 +02:00

mutes_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-27 18:09:28 +02:00

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

Clean up for api/base controller (#3629)

2017-06-07 20:09:25 +02:00

suggestions_controller.rb

Add API method to remove a suggestion (#7978)

2018-07-07 21:09:54 +02:00

trends_controller.rb

Change admin UI for hashtags and add back whitelisted trends (#11490)

2019-08-05 19:54:29 +02:00