me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
9948 commits 2 branches 0 tags 429 MiB
Commit graph

17 commits

Author SHA1 Message Date
Thibaut Girka
4f4908311d Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/controllers/api/v1/mutes_controller.rb
	config/locales/simple_form.pl.yml
 2018-08-27 18:09:28 +02:00
Jakub Mendyk
9c11d260e1 Make Api::V1::MutesController paginate properly (#8472) 
Fixes #8463
 2018-08-26 21:30:17 +02:00
Thibaut Girka
cf8121376b 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
34fdf77f48 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
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
Eugen Rochko
10fc551576 Fix unpermitted parameters warning when generating pagination URLs (#6995) 2018-04-02 02:09:50 +02:00
Surinna Curtis
8a90d61de0 Define a serializer for /api/v1/mutes/details 2017-09-13 21:47:30 -05:00
Surinna Curtis
2bd218dfdb Add a /api/v1/mutes/details route that just returns the array of mutes. 2017-09-13 21:47:30 -05:00
Eugen Rochko
20e15ecfb3 Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090) 2017-07-07 04:02:06 +02:00
Matt Jankowski
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
Matt Jankowski
3e95a6c9b7 Improve spec coverage and clean up api/v1/mutes controller (#3481) 2017-05-31 20:27:34 +02:00
Akihiko Odaki
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
Akihiko Odaki
f23a0655fe Fix regressions in api/v1 (#3178) 
The regressions are introduced at commit
9d32e7f6d5 by me (Akihiko Odaki)
 2017-05-20 17:48:34 +02:00
Akihiko Odaki
9d32e7f6d5 Use joins for account properties (#3167) 2017-05-20 15:13:51 +02:00
Eugen
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
Eugen Rochko
96e58cf289 Add counter caches for a large performance increase on API requests 2017-03-30 15:06:59 +02:00
Kit Redgrave
4554ccd5d0 Mute button progress so far. WIP, doesn't entirely work correctly. 2017-03-01 22:31:21 -06:00