Thibaut Girka a2a64ecd3e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.		2019-01-10 21:00:30 +01:00
..
accounts	Add exclude_reblogs option to account statuses API (#9640)	2018-12-27 03:42:35 +01: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	Extract counters from accounts table to account_stats table (#9295)	2018-11-19 00:43:52 +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	2018-11-27 13:23:02 +01:00
timelines	Allow joining several hashtags in a single column (#8904)	2018-11-05 18:53:25 +01:00
accounts_controller.rb	Add locale param to sign-up API (#9747)	2019-01-07 14:50:20 +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
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	Merge branch 'master' into glitch-soc/tentative-merge	2018-07-09 07:13:59 +02:00
statuses_controller.rb	Add scheduled statuses (#9706)	2019-01-05 12:43:28 +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