mastodon - Plural Café fork of Mastodon/Glitch Social

Age	Commit message (Collapse)	Author
2018-08-27	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml
2018-08-26	Make Api::V1::MutesController paginate properly (#8472)	Jakub Mendyk
	Fixes #8463
2018-07-09	Merge branch 'master' into glitch-soc/tentative-merge	Thibaut Girka
	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-05	Add more granular OAuth scopes (#7929)	Eugen Rochko
	* 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-04-01	Merge remote-tracking branch 'origin/master' into gs-master	David Yip
	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-02	Fix unpermitted parameters warning when generating pagination URLs (#6995)	Eugen Rochko

2017-09-13	Define a serializer for /api/v1/mutes/details	Surinna Curtis

2017-09-13	Add a /api/v1/mutes/details route that just returns the array of mutes.	Surinna Curtis

2017-07-07	Refactor JSON templates to be generated with ActiveModelSerializers instead ↵	Eugen Rochko
	of Rabl (#4090)
2017-06-07	Clean up for api/base controller (#3629)	Matt Jankowski
	* Move ApiController to Api/BaseController * API controllers inherit from Api::BaseController * Add coverage for various error cases in api/base controller
2017-05-31	Improve spec coverage and clean up api/v1/mutes controller (#3481)	Matt Jankowski

2017-05-21	Fix mutes_controller error and incorrect statuses_controller report (#3202)	Akihiko Odaki
	This commit fixes a regression in commit f55480756337dd4df7513e89673e81e003f1201a.
2017-05-20	Fix regressions in api/v1 (#3178)	Akihiko Odaki
	The regressions are introduced at commit f55480756337dd4df7513e89673e81e003f1201a by me (Akihiko Odaki)
2017-05-20	Use joins for account properties (#3167)	Akihiko Odaki

2017-04-08	Make public timelines API not require user context/app credentials (#1291)	Eugen
	* 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-03-30	Add counter caches for a large performance increase on API requests	Eugen Rochko

2017-03-01	Mute button progress so far. WIP, doesn't entirely work correctly.	Kit Redgrave