15 commits

Author	SHA1	Message	Date
Thibaut Girka	d392020da6	Merge branch 'master' into glitch-soc/tentative-merge ... Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.	2018-07-09 07:13:59 +02:00
Eugen Rochko	1f6ed4f86a	Add more granular OAuth scopes (#7929) ... * Add more granular OAuth scopes * Add human-readable descriptions of the new scopes * Ensure new scopes look good on the app UI * Add tests * Group scopes in screen and color-code dangerous ones * Fix wrong extra scope	2018-07-05 18:31:35 +02:00
David Yip	eb39db7f93	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
Eugen Rochko	33513753b9	Fix unpermitted parameters warning when generating pagination URLs (#6995)	2018-04-02 02:09:50 +02:00
Surinna Curtis	af2d793398	Define a serializer for /api/v1/mutes/details	2017-09-13 21:47:30 -05:00
Surinna Curtis	70592cdaba	Add a /api/v1/mutes/details route that just returns the array of mutes.	2017-09-13 21:47:30 -05:00
Eugen Rochko	8b2cad5637	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	2017-07-07 04:02:06 +02:00
Matt Jankowski	73540ffe6b	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
Matt Jankowski	bf811e4d4a	Improve spec coverage and clean up api/v1/mutes controller (#3481)	2017-05-31 20:27:34 +02:00
Akihiko Odaki	2af5cd96fe	Fix mutes_controller error and incorrect statuses_controller report (#3202) ... This commit fixes a regression in commit f554807563.	2017-05-21 13:32:13 +02:00
Akihiko Odaki	22cb286ad7	Fix regressions in api/v1 (#3178) ... The regressions are introduced at commit f554807563 by me (Akihiko Odaki)	2017-05-20 17:48:34 +02:00
Akihiko Odaki	f554807563	Use joins for account properties (#3167)	2017-05-20 15:13:51 +02:00
Eugen	b89f007862	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
Eugen Rochko	de22c202f5	Add counter caches for a large performance increase on API requests	2017-03-30 15:06:59 +02:00
Kit Redgrave	442fdbfc53	Mute button progress so far. WIP, doesn't entirely work correctly.	2017-03-01 22:31:21 -06:00