1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-03 17:28:35 +09:00
YuruToot/app/controllers/api/v1
Claire 93912f0498 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/account.rb`:
  Conflict because we (glitch-soc) have disabled trending of posts without
  review.
  Discarded that upstream change.
- `app/views/admin/settings/discovery/show.html.haml`:
  Just an extra setting in glitch-soc.
  Kept that extra setting.
2022-11-12 13:28:03 +01:00
..
accounts Merge branch 'main' into glitch-soc/merge-upstream 2022-11-10 09:36:47 +01:00
admin Fix admin APIs returning deleted object instead of empty object upon delete (#19479) 2022-10-30 02:43:57 +02: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 Fix POST /api/v1/emails/confirmations not being available after sign-up (#17743) 2022-03-12 04:14:25 +01:00
featured_tags Add ability to follow hashtags (#18809) 2022-07-17 13:49:29 +02:00
filters Add ability to filter individual posts (#18945) 2022-08-25 04:27:47 +02:00
instances Change about page to be mounted in the web UI (#19345) 2022-10-13 14:42:37 +02: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 use Notification::TYPES for api push subscription alerts (#18709) 2022-06-23 01:44:27 +02:00
statuses Add user content translations with configurable backends (#19218) 2022-09-23 23:00:12 +02:00
timelines Merge branch 'main' into glitch-soc/merge-upstream 2022-11-10 09:36:47 +01:00
trends Allow number of trending hashtags to be customizable (#1884) 2022-11-02 09:20:47 +01:00
accounts_controller.rb Add ability to filter followed accounts' posts by language (#19095) 2022-09-20 23:51:21 +02: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 follow scope to be covered by read and write scopes in REST API (#17678) 2022-03-03 16:13:40 +01:00
bookmarks_controller.rb Fix 500 error when a bookmark or favorite has been reported and deleted (#18174) 2022-04-28 23:34:58 +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 Change follow scope to be covered by read and write scopes in REST API (#17678) 2022-03-03 16:13:40 +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 Fix 500 error when a bookmark or favorite has been reported and deleted (#18174) 2022-04-28 23:34:58 +02:00
featured_tags_controller.rb Change featured tag updates to add/remove activity (#19409) 2022-10-22 18:30:55 +02:00
filters_controller.rb Fix crash in legacy filter creation controller (#19878) 2022-11-07 03:38:53 +01:00
follow_requests_controller.rb Fix duplicate notifications being possible after poll expiration (#17697) 2022-03-04 01:06:33 +01:00
followed_tags_controller.rb Add ability to follow hashtags (#18809) 2022-07-17 13:49:29 +02:00
instances_controller.rb Add server banner to web app, add GET /api/v2/instance to REST API (#19294) 2022-10-09 19:51:39 +02:00
lists_controller.rb Fix uncaught 500 error on invalid replies_policy (Fix #19097) (#20126) 2022-11-08 16:37:28 +01:00
markers_controller.rb Use Rails' index_by where it makes sense (#15542) 2021-01-12 09:27:38 +01:00
media_controller.rb Allow editing media attachments for scheduled toots (#17690) 2022-03-03 16:13:58 +01:00
mutes_controller.rb Change follow scope to be covered by read and write scopes in REST API (#17678) 2022-03-03 16:13:40 +01:00
notifications_controller.rb Fix incorrect permission check for notifications destroy/dismiss endpoints (#1787) 2022-05-27 16:21:59 +02: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 Fix report category not being saved in REST API (#17682) 2022-03-02 18:57:08 +01: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 'main' into glitch-soc/merge-upstream 2022-11-12 13:28:03 +01:00
streaming_controller.rb Remove useless respond_to calls (#13208) 2020-03-06 01:29:38 +01:00
suggestions_controller.rb Change auto-following admin-selected accounts, show in recommendations (#16078) 2021-04-24 17:01:43 +02:00
tags_controller.rb Improve performance by avoiding regex construction (#20215) 2022-11-10 05:49:30 +01:00