mastodon/app/controllers/api/v1
Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/status.rb
- db/schema.rb

Both conflicts are caused by us having extra database columns.
2019-03-05 19:23:16 +01:00
..
accounts Improve account media query (#10121) 2019-02-26 15:23:24 +01:00
apps Add vapid_key to the application entity in the REST API (#10058) 2019-02-16 05:27:05 +01:00
instances
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
statuses Merge branch 'master' into glitch-soc/merge-upstream 2019-01-19 18:28:37 +01:00
timelines Allow joining several hashtags in a single column (#8904) 2018-11-05 18:53:25 +01:00
accounts_controller.rb Add locale param to sign-up API (#9747) 2019-01-07 14:50:20 +01:00
apps_controller.rb
blocks_controller.rb Extract counters from accounts table to account_stats table (#9295) 2018-11-19 00:43:52 +01:00
bookmarks_controller.rb
conversations_controller.rb Add unread indicator to conversations (#9009) 2018-10-19 01:47:29 +02:00
custom_emojis_controller.rb Add cache to custom emojis API (#9732) 2019-01-06 23:52:58 +01:00
domain_blocks_controller.rb
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
follow_requests_controller.rb Extract counters from accounts table to account_stats table (#9295) 2018-11-19 00:43:52 +01:00
follows_controller.rb
instances_controller.rb Cache instance info (#8765) 2018-09-24 16:15:49 +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
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 2018-10-01 12:43:20 +02:00
polls_controller.rb Add polls (#10111) 2019-03-03 22:18:23 +01:00
reports_controller.rb Add unread indicator to conversations (#9009) 2018-10-19 01:47:29 +02:00
scheduled_statuses_controller.rb Add scheduled statuses (#9706) 2019-01-05 12:43:28 +01:00
search_controller.rb Add type, limit, offset, min_id, max_id, account_id to search API (#10091) 2019-02-26 15:21:36 +01:00
statuses_controller.rb Add polls (#10111) 2019-03-03 22:18:23 +01:00
streaming_controller.rb
suggestions_controller.rb