David Yip 201e82686f Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss		2018-01-17 18:37:09 -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	Represent numbers by strings in instance activity API (#6198)	2018-01-05 22:38:33 +01:00
lists	Add list of lists component to web UI (#5811)	2017-12-05 23:02:27 +01:00
statuses
timelines	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-17 18:37:09 -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
favourites_controller.rb
follow_requests_controller.rb
follows_controller.rb
instances_controller.rb
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
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
streaming_controller.rb