mastodon

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	53b7bb9d04	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml	7 years ago
Jakub Mendyk	f3a12ddfd0	Make Api::V1::MutesController paginate properly (#8472 ) Fixes #8463	7 years ago
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.	7 years ago
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	7 years ago
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	7 years ago
Eugen Rochko	33513753b9	Fix unpermitted parameters warning when generating pagination URLs (#6995 )	7 years ago
Surinna Curtis	af2d793398	Define a serializer for /api/v1/mutes/details	8 years ago
Surinna Curtis	70592cdaba	Add a /api/v1/mutes/details route that just returns the array of mutes.	8 years ago
Eugen Rochko	8b2cad5637	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090 )	8 years ago
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	8 years ago
Matt Jankowski	bf811e4d4a	Improve spec coverage and clean up api/v1/mutes controller (#3481 )	8 years ago
Akihiko Odaki	2af5cd96fe	Fix mutes_controller error and incorrect statuses_controller report (#3202 ) This commit fixes a regression in commit `f554807563`.	8 years ago
Akihiko Odaki	22cb286ad7	Fix regressions in api/v1 (#3178 ) The regressions are introduced at commit `f554807563` by me (Akihiko Odaki)	8 years ago
Akihiko Odaki	f554807563	Use joins for account properties (#3167 )	8 years ago
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	8 years ago
Eugen Rochko	de22c202f5	Add counter caches for a large performance increase on API requests	8 years ago
Kit Redgrave	442fdbfc53	Mute button progress so far. WIP, doesn't entirely work correctly.	8 years ago

17 Commits (571d219bb917cefcca7419a0ad4e3889689d5f6a)