treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/app/controllers/api/v1
History
Thibaut Girka a96375d2ef Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- README.md
  discarded upstream changes
- app/controllers/api/v1/bookmarks_controller.rb
  finally merged upstream, some code style fixes
  and slightly changed pagination code
- app/controllers/application_controller.rb
  changed upstream to always return HTML error pages
  slight conflict caused by theming code
- app/models/bookmark.rb
  finally merged upstream, no real conflict
- spec/controllers/api/v1/bookmarks_controller_spec.rb
  finally merged upstream, slightly changed pagination code
 		2019-11-20 15:36:09 +01:00
..
accounts make it not return http 400 when passing and empty source argument (#12259) 2019-11-16 19:02:09 +01:00
admin Change deletes to preserve soft-deleted statuses in unresolved reports (#11805) 2019-09-11 16:32:44 +02:00
apps Add vapid_key to the application entity in the REST API (#10058) 2019-02-16 05:27:05 +01:00
featured_tags Add featured tags API (#11778) 2019-09-09 10:50:33 +02:00
instances Fix `GET /api/v1/instance` REST APIs being unavailable in secure mode (#12089) 2019-10-06 22:11:29 +02: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 web push notifications for polls (#10864) 2019-05-28 00:26:08 +02:00
statuses Add bookmarks (#7107) 2019-11-13 23:02:10 +01:00
timelines Merge branch 'master' into glitch-soc/merge-upstream 2019-10-10 17:26:08 +02:00
accounts_controller.rb Add `reason` param to `POST /api/v1/accounts` REST API (#12064) 2019-10-03 17:50:59 +02:00
apps_controller.rb Add whitelist mode (#11291) 2019-07-30 11:10:46 +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 Support min_id-based pagination for bookmarks (#12381) 2019-11-17 17:09:41 +01:00
conversations_controller.rb Add unread indicator to conversations (#9009) 2018-10-19 01:47:29 +02:00
custom_emojis_controller.rb Change unlisted custom emoji to not appear in autosuggestions (#11818) 2019-09-13 16:01:09 +02:00
directories_controller.rb Add profile directory to web UI (#11688) 2019-08-30 00:14:36 +02: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
featured_tags_controller.rb Add featured tags API (#11778) 2019-09-09 10:50:33 +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 Add updated relationship to follow request API responses (#11800) 2019-09-10 20:56:42 +02:00
instances_controller.rb Fix `GET /api/v1/instance` REST APIs being unavailable in secure mode (#12089) 2019-10-06 22:11:29 +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
markers_controller.rb Add timeline read markers API (#11762) 2019-09-06 13:55:51 +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 2019-05-23 19:01:30 +02:00
polls_controller.rb Fix poll API not requiring authentication on non-public polls (#10960) 2019-06-04 20:10:26 +02:00
preferences_controller.rb Add a preferences API so apps can share basic behaviours (#10109) 2019-03-15 02:39:20 +01:00
reports_controller.rb Add soft delete for statuses for instant deletes through API (#11623) 2019-08-22 21:55:56 +02:00
scheduled_statuses_controller.rb Add scheduled statuses (#9706) 2019-01-05 12:43:28 +01:00
statuses_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-08-29 12:07:50 +02:00
streaming_controller.rb Fix attachment not being re-downloaded even if file is not stored (#12125) 2019-10-09 07:10:46 +02:00
suggestions_controller.rb Add API method to remove a suggestion (#7978) 2018-07-07 21:09:54 +02:00
trends_controller.rb Change admin UI for hashtags and add back whitelisted trends (#11490) 2019-08-05 19:54:29 +02:00