1
0
mirror of https://github.com/funamitech/mastodon synced 2024-11-30 07:49:04 +09:00
YuruToot/app/controllers/api/v1
David Yip 4cca1d1e7e
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
	app/controllers/auth/confirmations_controller.rb
2017-12-30 17:20:07 -06:00
..
accounts Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983) 2017-12-12 03:55:39 +01:00
apps Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112) 2017-09-30 22:05:42 +02:00
instances Add more instance stats APIs (#6125) 2017-12-29 19:52:04 +01:00
lists Add list of lists component to web UI (#5811) 2017-12-05 23:02:27 +01:00
statuses Pinned statuses (#4675) 2017-08-25 01:41:18 +02:00
timelines Merge remote-tracking branch 'origin/master' into merge-upstream 2017-11-17 17:40:00 -06:00
accounts_controller.rb Using double splat operator (#5859) 2017-12-06 11:41:57 +01:00
apps_controller.rb Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112) 2017-09-30 22:05:42 +02:00
blocks_controller.rb Fix pagination in Api::V1::BlocksController (#5285) 2017-10-09 17:30:31 +02:00
custom_emojis_controller.rb Improve admin UI for custom emojis, add copy/disable/enable (#5231) 2017-10-05 23:42:05 +02:00
domain_blocks_controller.rb Clean up for api/base controller (#3629) 2017-06-07 20:09:25 +02:00
favourites_controller.rb Merge queries in Api::V1::FavouritesController (#4359) 2017-07-25 16:01:03 +02:00
follow_requests_controller.rb Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090) 2017-07-07 04:02:06 +02:00
follows_controller.rb Fix POST /api/v1/follows error when already following (#4878) 2017-09-10 15:09:06 +02:00
instances_controller.rb Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090) 2017-07-07 04:02:06 +02:00
lists_controller.rb Limit users to 50 lists, remove pagination from lists API (#5933) 2017-12-09 01:32:29 +01:00
media_controller.rb Add ability to specify alternative text for media attachments (#5123) 2017-09-28 15:31:31 +02:00
mutes_controller.rb Define a serializer for /api/v1/mutes/details 2017-09-13 21:47:30 -05:00
notifications_controller.rb New notification cleaning mode (#89) 2017-07-21 20:33:16 +02:00
reports_controller.rb Add moderator role and add pundit policies for admin actions (#5635) 2017-11-11 20:23:33 +01:00
search_controller.rb Merge tootsuite/master at 3023725936 2017-11-16 01:21:16 -06:00
statuses_controller.rb Make PreviewCard records reuseable between statuses (#4642) 2017-09-01 16:20:16 +02:00
streaming_controller.rb Clean up for api/base controller (#3629) 2017-06-07 20:09:25 +02:00