21394c5462
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
app/views/accounts/_header.html.haml
2018-04-01 20:24:50 -05:00
10fc551576
Fix unpermitted parameters warning when generating pagination URLs ( #6995 )
2018-04-02 02:09:50 +02:00
8a90d61de0
Define a serializer for /api/v1/mutes/details
2017-09-13 21:47:30 -05:00
2bd218dfdb
Add a /api/v1/mutes/details route that just returns the array of mutes.
2017-09-13 21:47:30 -05:00
20e15ecfb3
Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl ( #4090 )
2017-07-07 04:02:06 +02:00
76f986d07b
Clean up for api/base controller ( #3629 )
...
* Move ApiController to Api/BaseController
* API controllers inherit from Api::BaseController
* Add coverage for various error cases in api/base controller
2017-06-07 20:09:25 +02:00
3e95a6c9b7
Improve spec coverage and clean up api/v1/mutes controller ( #3481 )
2017-05-31 20:27:34 +02:00
90c8175cb0
Fix mutes_controller error and incorrect statuses_controller report ( #3202 )
...
This commit fixes a regression in commit
9d32e7f6d5
2017-05-21 13:32:13 +02:00
f23a0655fe
Fix regressions in api/v1 ( #3178 )
...
The regressions are introduced at commit
9d32e7f6d5
2017-05-20 17:48:34 +02:00
9d32e7f6d5
Use joins for account properties ( #3167 )
2017-05-20 15:13:51 +02:00
3047a8da74
Make public timelines API not require user context/app credentials ( #1291 )
...
* Make /api/v1/timelines/public and /api/v1/timelines/tag/:id public
Fix #1156 - respect query params when generating pagination links in API
* Apply pagination fix to more APIs
2017-04-08 23:39:31 +02:00
96e58cf289
Add counter caches for a large performance increase on API requests
2017-03-30 15:06:59 +02:00
4554ccd5d0
Mute button progress so far. WIP, doesn't entirely work correctly.
2017-03-01 22:31:21 -06:00
David Yip