tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
9748f074a3
mastodon/app/controllers/api/v1
History
Thibaut Girka 9748f074a3 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/api/v1/timelines/public_controller.rb
- app/lib/feed_manager.rb
- app/models/status.rb
- app/services/precompute_feed_service.rb
- app/workers/feed_insert_worker.rb
- spec/models/status_spec.rb

All conflicts are due to upstream refactoring feed management and us having
local-only toots on top of that. Rewrote local-only toots management for
upstream's changes.
2020-09-08 16:26:47 +02:00
..
accounts Added account featured tags API (#11817) 2020-09-02 02:13:10 +02:00
admin Make Array-creation behavior of Paginable more predictable (#14687) 2020-08-31 12:47:09 +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 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 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 Add more tests for ActivityPub controllers (#13585) 2020-05-03 16:30:36 +02:00
push Add more tests for ActivityPub controllers (#13585) 2020-05-03 16:30:36 +02:00
statuses Fix not being able to unbookmark toots when blocked by their author (#14604) 2020-08-19 19:02:06 +02:00
timelines Merge branch 'master' into glitch-soc/merge-upstream 2020-09-08 16:26:47 +02: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 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 Remove useless respond_to calls (#13208) 2020-03-06 01:29:38 +01: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 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 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 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-08-30 16:13:08 +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