Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb

2018-10-01 12:43:20 +02:00

..

accounts

Support min_id-based pagination in REST API (#8736)

2018-09-28 02:23:45 +02:00

apps

Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)

2017-09-30 22:05:42 +02:00

instances

Represent numbers by strings in instance activity API (#6198)

2018-01-05 22:38:33 +01:00

lists

Fix low-hanging rubocop gripes (#8458)

2018-08-26 19:22:46 +02:00

push

Fix 404 for GET /api/v1/push/subscription (#7472)

2018-05-13 21:45:18 +02:00

statuses

Introduce OAuth scopes for bookmarks

2018-08-10 15:26:52 +02:00

timelines

Support min_id-based pagination in REST API (#8736)

2018-09-28 02:23:45 +02:00

accounts_controller.rb

Add more granular OAuth scopes (#7929)

2018-07-05 18:31:35 +02:00

apps_controller.rb

Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)

2017-09-30 22:05:42 +02:00

blocks_controller.rb

Add more granular OAuth scopes (#7929)

2018-07-05 18:31:35 +02:00

bookmarks_controller.rb

Introduce OAuth scopes for bookmarks

2018-08-10 15:26:52 +02:00

custom_emojis_controller.rb

Improve admin UI for custom emojis, add copy/disable/enable (#5231)

2017-10-05 23:42:05 +02:00

domain_blocks_controller.rb

Add more granular OAuth scopes (#7929)

2018-07-05 18:31:35 +02:00

endorsements_controller.rb

Add API endpoint to list featured accounts (fixes #8315) (#8317)

2018-08-20 18:46:04 +02:00

favourites_controller.rb

Support min_id-based pagination in REST API (#8736)

2018-09-28 02:23:45 +02:00

filters_controller.rb

Add option to not consider word boundaries when processing keyword filtering (#7975)

2018-07-09 02:22:09 +02:00

follow_requests_controller.rb

Self-notify on accepting follow requests (#8541)

2018-08-31 15:17:31 +02:00

follows_controller.rb

Add more granular OAuth scopes (#7929)

2018-07-05 18:31:35 +02:00

instances_controller.rb

Cache instance info (#8765)

2018-09-24 16:15:49 +02:00

lists_controller.rb

Fix low-hanging rubocop gripes (#8458)

2018-08-26 19:22:46 +02:00

media_controller.rb

Add more granular OAuth scopes (#7929)

2018-07-05 18:31:35 +02:00

mutes_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-27 18:09:28 +02:00

notifications_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-01 12:43:20 +02:00

reports_controller.rb

Support min_id-based pagination in REST API (#8736)

2018-09-28 02:23:45 +02:00

search_controller.rb

Merge branch 'master' into glitch-soc/tentative-merge

2018-07-09 07:13:59 +02:00

statuses_controller.rb

Unuse ActiveRecord::Base#cache_key (#8185)

2018-08-19 15:52:38 +02:00

streaming_controller.rb

Clean up for api/base controller (#3629)

2017-06-07 20:09:25 +02:00

suggestions_controller.rb

Add API method to remove a suggestion (#7978)

2018-07-07 21:09:54 +02:00