tykayn
/
mastodon
mirror of https://framagit.org/tykayn/mastodon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/api/v1
History
Thibaut Girka f3eff922a3 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `app/validators/poll_validator.rb`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `config/initializers/content_security_policy.rb`:
  Upstream added a rule, the way we compute ours is different, but
  that added rule has been ported.
- `package.json`:
  No real conflict, dependency update. Performed the same update.
- `yarn.lock`:
  No real conflict, dependency update. Performed the same update.
 		2020-04-02 20:32:00 +02:00
..
accounts Add federation support for the "hide network" preference (#11673) 2020-03-09 00:10:29 +01:00
admin Change deletes to preserve soft-deleted statuses in unresolved reports (#11805) 2019-09-11 16:32:44 +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
featured_tags Remove useless `respond_to` calls (#13208) 2020-03-06 01:29:38 +01:00
instances Remove useless `respond_to` calls (#13208) 2020-03-06 01:29:38 +01:00
lists Extract counters from accounts table to account_stats table (#9295) 2018-11-19 00:43:52 +01:00
polls Remove useless `respond_to` calls (#13208) 2020-03-06 01:29:38 +01:00
push Add follow_request notification type (#12198) 2019-12-01 17:25:29 +01:00
statuses Add specific rate limits for posting and following (#13172) 2020-03-08 15:17:39 +01:00
timelines Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
accounts_controller.rb Add specific rate limits for posting and following (#13172) 2020-03-08 15:17:39 +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 Remove useless `respond_to` calls (#13208) 2020-03-06 01:29:38 +01:00
bookmarks_controller.rb Remove useless `respond_to` calls (#13208) 2020-03-06 01:29:38 +01:00
conversations_controller.rb Remove useless `respond_to` calls (#13208) 2020-03-06 01:29:38 +01: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 Remove useless `respond_to` calls (#13208) 2020-03-06 01:29:38 +01:00
favourites_controller.rb Remove useless `respond_to` calls (#13208) 2020-03-06 01:29:38 +01: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 updated relationship to follow request API responses (#11800) 2019-09-10 20:56:42 +02:00
instances_controller.rb Remove useless `respond_to` calls (#13208) 2020-03-06 01:29:38 +01:00
lists_controller.rb Add backend support to read and update list-specific show_replies settings 2018-11-28 14:46:07 +01:00
markers_controller.rb Add timeline read markers API (#11762) 2019-09-06 13:55:51 +02:00
media_controller.rb Change local media attachments to perform heavy processing asynchronously (#13210) 2020-03-08 23:56:18 +01:00
mutes_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
notifications_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
polls_controller.rb Remove useless `respond_to` calls (#13208) 2020-03-06 01:29:38 +01:00
preferences_controller.rb Remove useless `respond_to` calls (#13208) 2020-03-06 01:29:38 +01:00
reports_controller.rb Remove useless `respond_to` calls (#13208) 2020-03-06 01:29:38 +01:00
scheduled_statuses_controller.rb Add scheduled statuses (#9706) 2019-01-05 12:43:28 +01:00
statuses_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-04-02 20:32:00 +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