queer-af/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
mastodon/app/controllers/api/v1
History
Thibaut Girka c0dc247bce Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb

Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.
2019-05-23 19:01:30 +02:00
..
accounts Improve blocked view of profiles (#10491) 2019-04-07 04:59:13 +02:00
apps Add vapid_key to the application entity in the REST API (#10058) 2019-02-16 05:27:05 +01:00
instances Explicitly disable storage of REST API results (#10655) 2019-05-03 20:39:19 +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
statuses Merge branch 'master' into glitch-soc/merge-upstream 2019-04-08 15:57:56 +02:00
timelines Fix tagged param not being normalized before querying tags (#10249) 2019-03-13 13:02:13 +01:00
accounts_controller.rb Improve blocked view of profiles (#10491) 2019-04-07 04:59:13 +02: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 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 Explicitly disable storage of REST API results (#10655) 2019-05-03 20:39:19 +02: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 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
follows_controller.rb
instances_controller.rb Explicitly disable storage of REST API results (#10655) 2019-05-03 20:39:19 +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 2019-05-23 19:01:30 +02:00
polls_controller.rb Add polls (#10111) 2019-03-03 22:18:23 +01: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 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 API support for setting status content-type 2019-05-17 23:51:14 +02:00
streaming_controller.rb
suggestions_controller.rb Add API method to remove a suggestion (#7978) 2018-07-07 21:09:54 +02:00