You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		6 years ago
..
accounts	Add more granular OAuth scopes (#7929)	6 years ago
apps	Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)	7 years ago
instances	Represent numbers by strings in instance activity API (#6198)	6 years ago
lists	Add more granular OAuth scopes (#7929)	6 years ago
push	Fix 404 for GET /api/v1/push/subscription (#7472)	6 years ago
statuses	Merge branch 'master' into glitch-soc/tentative-merge	6 years ago
timelines	Add more granular OAuth scopes (#7929)	6 years ago
accounts_controller.rb	Add more granular OAuth scopes (#7929)	6 years ago
apps_controller.rb	Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)	7 years ago
blocks_controller.rb	Add more granular OAuth scopes (#7929)	6 years ago
bookmarks_controller.rb	Add backend support for bookmarks	6 years ago
custom_emojis_controller.rb	Improve admin UI for custom emojis, add copy/disable/enable (#5231)	7 years ago
domain_blocks_controller.rb	Add more granular OAuth scopes (#7929)	6 years ago
favourites_controller.rb	Add more granular OAuth scopes (#7929)	6 years ago
filters_controller.rb	Add option to not consider word boundaries when processing keyword filtering (#7975)	6 years ago
follow_requests_controller.rb	Add more granular OAuth scopes (#7929)	6 years ago
follows_controller.rb	Add more granular OAuth scopes (#7929)	6 years ago
instances_controller.rb	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	7 years ago
lists_controller.rb	Add more granular OAuth scopes (#7929)	6 years ago
media_controller.rb	Add more granular OAuth scopes (#7929)	6 years ago
mutes_controller.rb	Merge branch 'master' into glitch-soc/tentative-merge	6 years ago
notifications_controller.rb	Merge branch 'master' into glitch-soc/tentative-merge	6 years ago
reports_controller.rb	Add more granular OAuth scopes (#7929)	6 years ago
search_controller.rb	Merge branch 'master' into glitch-soc/tentative-merge	6 years ago
statuses_controller.rb	Add more granular OAuth scopes (#7929)	6 years ago
streaming_controller.rb	Clean up for api/base controller (#3629)	7 years ago
suggestions_controller.rb	Add API method to remove a suggestion (#7978)	6 years ago