UnionRoom
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
mastodon/app/controllers/api/v1
History
Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.
 		2022-11-06 09:50:41 +01:00
..
accounts Merge branch 'main' into glitch-soc/merge-upstream 2022-10-02 18:46:22 +02:00
admin Fix admin APIs returning deleted object instead of empty object upon delete (#19479) 2022-10-30 02:43:57 +02:00
announcements
…
apps
…
crypto
…
emails
…
featured_tags
…
filters
…
instances Change about page to be mounted in the web UI (#19345) 2022-10-13 14:42:37 +02:00
lists
…
polls
…
push
…
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-10-31 08:37:32 +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
…
apps_controller.rb
…
blocks_controller.rb
…
bookmarks_controller.rb
…
conversations_controller.rb
…
custom_emojis_controller.rb
…
directories_controller.rb
…
domain_blocks_controller.rb
…
endorsements_controller.rb
…
favourites_controller.rb
…
featured_tags_controller.rb Change featured tag updates to add/remove activity (#19409) 2022-10-22 18:30:55 +02:00
filters_controller.rb
…
follow_requests_controller.rb
…
followed_tags_controller.rb
…
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
…
markers_controller.rb
…
media_controller.rb
…
mutes_controller.rb
…
notifications_controller.rb
…
polls_controller.rb
…
preferences_controller.rb
…
reports_controller.rb
…
scheduled_statuses_controller.rb
…
statuses_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
streaming_controller.rb
…
suggestions_controller.rb
…
tags_controller.rb
…