treehouse
/
mastodon
20
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/app/controllers/api/v1
History
Claire ce84d163cc Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.prettierignore`:
  Upstream added a line at the end, glitch-soc had extra entries at the end.
  Added upstream's new line before glitch-soc's.
- `Gemfile.lock`:
  Upstream updated dependencies while glitch-soc has an extra one (hcaptcha).
  Updated dependencies like upstream did.
- `app/controllers/api/v1/statuses_controller.rb`:
  Not a real conflict, upstream added a parameter (`allowed_mentions`) where
  glitch-soc already had an extra one (`content_type`).
  Added upstream's new parameter.
- `app/javascript/styles/fonts/roboto-mono.scss`:
  A lot of lines were changed upstream due to code style changes, and a lot
  of those lines had path changes to accomodate glitch-soc's theming system.
  Applied upstream's style changes.
- `app/javascript/styles/fonts/roboto.scss`:
  A lot of lines were changed upstream due to code style changes, and a lot
  of those lines had path changes to accomodate glitch-soc's theming system.
  Applied upstream's style changes.
 		2023-02-13 19:35:35 +01:00
..
accounts Merge branch 'main' into glitch-soc/merge-upstream 2023-01-14 22:34:09 +01:00
admin Fix /api/v1/admin/trends/tags using wrong serializer (#18943) 2023-01-18 16:28:18 +01:00
announcements
…
apps
…
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
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
…
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
…
apps_controller.rb
…
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
…
directories_controller.rb
…
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 irreversible and whole_word parameters handling in /api/v1/filters (#21988) 2022-12-07 00:10: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 Fix pagination of followed tags (#20861) 2022-11-17 10:54:10 +01: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 Merge branch 'main' into glitch-soc/merge-upstream 2023-02-03 19:23:27 +01:00
polls_controller.rb
…
preferences_controller.rb
…
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 2023-02-13 19:35:35 +01:00
streaming_controller.rb Apply Rubocop Style/NegatedIfElseCondition (#23451) 2023-02-08 07:07:36 +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 Fix not being able to follow more than one hashtag (#21285) 2022-11-21 10:35:09 +01:00