queer-af/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
mastodon/app/controllers/api/v1
History
Claire f8d867bac4 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/remove_status_service.rb`:
  Conflict caused by us having a distinc Direct timeline.
  Ported upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
  Conflict between glitch-soc's variable character limit and upstream
  refactoring that part of the code.
  Ported upstream changes.
2020-12-05 17:33:37 +01:00
..
accounts Merge branch 'master' into glitch-soc/merge-upstream 2020-12-05 17:33:37 +01:00
admin Add account sensitized (#14361) 2020-11-04 20:45:01 +01:00
announcements
apps
crypto Make Array-creation behavior of Paginable more predictable (#14687) 2020-08-31 12:47:09 +02:00
featured_tags Changed tag most_used to recently_used (#14760) 2020-09-07 17:47:41 +02:00
instances
lists Change REST API to return empty data for suspended accounts (#14765) 2020-09-11 15:16:29 +02:00
polls Add more tests for ActivityPub controllers (#13585) 2020-05-03 16:30:36 +02:00
push Fix not being able to enable status notifications in Web Push API (#14822) 2020-09-21 17:48:55 +02:00
statuses Fix not being able to unfavorite toots one has lost access to (#15192) 2020-11-21 06:18:09 +01:00
timelines Fix “Show boosts/replies in public timelines” only affecting streaming 2020-11-12 23:44:53 +01:00
accounts_controller.rb Add duration parameter to muting. (#13831) 2020-10-13 01:01:14 +02:00
announcements_controller.rb
apps_controller.rb
blocks_controller.rb Change REST API to return empty data for suspended accounts (#14765) 2020-09-11 15:16:29 +02:00
bookmarks_controller.rb Make Array-creation behavior of Paginable more predictable (#14687) 2020-08-31 12:47:09 +02:00
conversations_controller.rb Make Array-creation behavior of Paginable more predictable (#14687) 2020-08-31 12:47:09 +02:00
custom_emojis_controller.rb
directories_controller.rb
domain_blocks_controller.rb
endorsements_controller.rb Change REST API to return empty data for suspended accounts (#14765) 2020-09-11 15:16:29 +02:00
favourites_controller.rb Make Array-creation behavior of Paginable more predictable (#14687) 2020-08-31 12:47:09 +02:00
featured_tags_controller.rb
filters_controller.rb
follow_requests_controller.rb Add option to be notified when a followed user posts (#13546) 2020-09-18 17:26:45 +02:00
instances_controller.rb
lists_controller.rb Add configuration option to filter replies in lists (#9205) 2020-09-01 13:31:28 +02:00
markers_controller.rb
media_controller.rb Add customizable thumbnails for audio and video attachments (#14145) 2020-06-29 13:56:55 +02:00
mutes_controller.rb Add duration parameter to muting. (#13831) 2020-10-13 01:01:14 +02:00
notifications_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-09-28 14:13:30 +02:00
polls_controller.rb Add more tests for ActivityPub controllers (#13585) 2020-05-03 16:30:36 +02:00
preferences_controller.rb
reports_controller.rb Add rate limit for reporting (#13390) 2020-04-05 14:40:08 +02:00
scheduled_statuses_controller.rb Make Array-creation behavior of Paginable more predictable (#14687) 2020-08-31 12:47:09 +02:00
statuses_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-07-22 13:38:17 +02:00
streaming_controller.rb
suggestions_controller.rb
trends_controller.rb