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

Conflicts:
- app/views/admin/settings/edit.html.haml:
  Conflict due to how the theming settings change.

2019-03-14 17:17:20 +01:00

..

accounts

Fix tagged param not being normalized before querying tags (#10249)

2019-03-13 13:02:13 +01:00

apps

Add vapid_key to the application entity in the REST API (#10058)

2019-02-16 05:27:05 +01:00

instances

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

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

lists

Extract counters from accounts table to account_stats table (#9295)

2018-11-19 00:43:52 +01:00

polls

Add polls (#10111)

2019-03-03 22:18:23 +01:00

push

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

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

statuses

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

2019-01-19 18:28:37 +01:00

timelines

Fix tagged param not being normalized before querying tags (#10249)

2019-03-13 13:02:13 +01:00

accounts_controller.rb

Admission-based registrations mode (#10250)

2019-03-14 05:28:30 +01: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

Extract counters from accounts table to account_stats table (#9295)

2018-11-19 00:43:52 +01:00

bookmarks_controller.rb

Introduce OAuth scopes for bookmarks

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

conversations_controller.rb

Add unread indicator to conversations (#9009)

2018-10-19 01:47:29 +02:00

custom_emojis_controller.rb

Add cache to custom emojis API (#9732)

2019-01-06 23:52:58 +01:00

domain_blocks_controller.rb

Add more granular OAuth scopes (#7929)

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

endorsements_controller.rb

Extract counters from accounts table to account_stats table (#9295)

2018-11-19 00:43:52 +01: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

Extract counters from accounts table to account_stats table (#9295)

2018-11-19 00:43:52 +01: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

Add backend support to read and update list-specific show_replies settings

2018-11-28 14:46:07 +01: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

polls_controller.rb

Add polls (#10111)

2019-03-03 22:18:23 +01:00

reports_controller.rb

Add unread indicator to conversations (#9009)

2018-10-19 01:47:29 +02:00

scheduled_statuses_controller.rb

Add scheduled statuses (#9706)

2019-01-05 12:43:28 +01:00

search_controller.rb

Add type, limit, offset, min_id, max_id, account_id to search API (#10091)

2019-02-26 15:21:36 +01:00

statuses_controller.rb

Add polls (#10111)

2019-03-03 22:18:23 +01: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