fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-28 07:57:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/controllers/api/v1
History
Claire e2a2bc9021 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream updated copyright year, we don't mention it so kept our version.
- `app/controllers/admin/dashboard_controller.rb`:
  Not really a conflict, upstream change (removing the spam checker) too close
  to glitch-soc changes. Ported upstream changes.
- `app/models/form/admin_settings.rb`:
  Same.
- `app/services/remove_status_service.rb`:
  Same.
- `app/views/admin/settings/edit.html.haml`:
  Same.
- `config/settings.yml`:
  Same.
- `config/environments/production.rb`:
  Not a real conflict, upstream added a default HTTP header, but we have
  extra headers in glitch-soc.
  Added the header.
2021-04-20 12:17:14 +02:00
..
accounts Merge branch 'main' into glitch-soc/merge-upstream 2021-02-22 15:23:46 +01:00
admin Add account sensitized (#14361) 2020-11-04 20:45:01 +01:00
announcements Add announcements (#12662) 2020-01-23 22:00:13 +01:00
apps Remove useless respond_to calls (#13208) 2020-03-06 01:29:38 +01:00
crypto Optimize map { ... }.compact calls (#15513) 2021-01-10 00:32:01 +01:00
emails Add email param to POST /api/v1/emails/confirmations (#15949) 2021-03-25 02:46:13 +01:00
featured_tags Changed tag most_used to recently_used (#14760) 2020-09-07 17:47:41 +02:00
instances Add server rules (#15769) 2021-02-21 19:50:12 +01:00
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 Add policy param to POST /api/v1/push/subscriptions (#16040) 2021-04-15 05:00:25 +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 details to error response for POST /api/v1/accounts in REST API (#15803) 2021-03-01 04:59:13 +01:00
announcements_controller.rb Fix dismissing an announcement twice raising an obscure error (#13124) 2020-02-24 22:21:40 +01:00
apps_controller.rb Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
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 Remove useless respond_to calls (#13208) 2020-03-06 01:29:38 +01:00
directories_controller.rb Add profile directory to web UI (#11688) 2019-08-30 00:14:36 +02:00
domain_blocks_controller.rb Remove useless respond_to calls (#13208) 2020-03-06 01:29:38 +01:00
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 Add featured tags API (#11778) 2019-09-09 10:50:33 +02:00
filters_controller.rb Remove useless respond_to calls (#13208) 2020-03-06 01:29:38 +01:00
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 Remove useless respond_to calls (#13208) 2020-03-06 01:29:38 +01:00
lists_controller.rb Add configuration option to filter replies in lists (#9205) 2020-09-01 13:31:28 +02:00
markers_controller.rb Use Rails' index_by where it makes sense (#15542) 2021-01-12 09:27:38 +01:00
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 'main' into glitch-soc/merge-upstream 2021-02-03 17:02:48 +01:00
polls_controller.rb Add more tests for ActivityPub controllers (#13585) 2020-05-03 16:30:36 +02:00
preferences_controller.rb Remove useless respond_to calls (#13208) 2020-03-06 01:29:38 +01:00
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 Remove useless respond_to calls (#13208) 2020-03-06 01:29:38 +01:00
suggestions_controller.rb Add cold-start follow recommendations (#15945) 2021-04-12 12:37:14 +02:00
trends_controller.rb Remove useless respond_to calls (#13208) 2020-03-06 01:29:38 +01:00