mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity
donphan/app/controllers/api/v1
History
Claire 90528f43bc Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `config/webpack/configuration.js`:
  Upstream updated the `js-yaml` dependency, which changed how to call it.
  Those changes conflicted because that code is pretty different in glitch-soc
  which has to deal with its more complex theming system.
  Proceeded to the same compatibility changes in glitch-soc's code.
- `package.json` and `yarn.lock`:
  Not really a conflict, just glitch-soc-specific dependencies textually too
  close to some dependencies updated upstream.
 		2021-01-06 18:08:06 +01:00
..
accounts Merge branch 'master' into glitch-soc/merge-upstream 2021-01-06 18:08:06 +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 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 Fix performance on instances list in admin UI (#15282) 2020-12-14 09:06:34 +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 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 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 Add timeline read markers API (#11762) 2019-09-06 13:55:51 +02: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 '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 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 Remove useless `respond_to` calls (#13208) 2020-03-06 01:29:38 +01:00
trends_controller.rb Remove useless `respond_to` calls (#13208) 2020-03-06 01:29:38 +01:00